summaryrefslogtreecommitdiff
path: root/fs/nfsd/netns.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-02-20 22:10:38 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-02-20 22:10:38 +0300
commit575a7e0f812a4968ad1e0c00026692ede040e13f (patch)
treec669f2892c6894b20a8f1a1a194f26d00c7de243 /fs/nfsd/netns.h
parent219ac97a486c1ad9c110cb96ebdad7ba068236fb (diff)
parentc65454a947263dfdf482076388aaed60af84ca2f (diff)
downloadlinux-575a7e0f812a4968ad1e0c00026692ede040e13f.tar.xz
Merge tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton: "The main change here is that I've broken out most of the file locking definitions into a new header file. I also went ahead and completed the removal of locks_inode function" * tag 'locks-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: fs: remove locks_inode filelock: move file locking definitions to separate header file
Diffstat (limited to 'fs/nfsd/netns.h')
-rw-r--r--fs/nfsd/netns.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index 51a4b7885cae..ec49b200b797 100644
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -10,6 +10,7 @@
#include <net/net_namespace.h>
#include <net/netns/generic.h>
+#include <linux/filelock.h>
#include <linux/percpu_counter.h>
#include <linux/siphash.h>