diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 08:31:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 08:31:37 -0800 |
| commit | 19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7 (patch) | |
| tree | fe92aedc62b5283b2473cd1506ef760285d94f7a /fs/dlm/user.c | |
| parent | 3e5cecf26842ecfde8ea487c02cb12709cd90ef5 (diff) | |
| parent | 26c1ec2fe410ba861f15ebbfc9f44f907a41b6ff (diff) | |
| download | linux-19d37ce2a7159ee30bd59d14fe5fe13c932bd5b7.tar.bz2 | |
Merge tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fixes from David Teigland:
"This set fixes error reporting for dlm sockets, removes the unbound
property on the dlm callback workqueue to improve performance, and
includes a couple trivial changes"
* tag 'dlm-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: fix error return code in sctp_accept_from_sock()
dlm: don't specify WQ_UNBOUND for the ast callback workqueue
dlm: remove lock_sock to avoid scheduling while atomic
dlm: don't save callbacks after accept
dlm: audit and remove any unnecessary uses of module.h
dlm: make genl_ops const
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 58c2f4a21b7f..1ce908c2232c 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -9,7 +9,6 @@ #include <linux/miscdevice.h> #include <linux/init.h> #include <linux/wait.h> -#include <linux/module.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/poll.h> |