diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 11:10:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 11:10:38 -0800 |
| commit | 575a7e0f812a4968ad1e0c00026692ede040e13f (patch) | |
| tree | c669f2892c6894b20a8f1a1a194f26d00c7de243 /fs/ceph | |
| parent | 219ac97a486c1ad9c110cb96ebdad7ba068236fb (diff) | |
| parent | c65454a947263dfdf482076388aaed60af84ca2f (diff) | |
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/ceph')
| -rw-r--r-- | fs/ceph/caps.c | 1 | ||||
| -rw-r--r-- | fs/ceph/locks.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c index 210e40037881..7cc20772eac9 100644 --- a/fs/ceph/caps.c +++ b/fs/ceph/caps.c @@ -9,6 +9,7 @@ #include <linux/wait.h> #include <linux/writeback.h> #include <linux/iversion.h> +#include <linux/filelock.h> #include "super.h" #include "mds_client.h" diff --git a/fs/ceph/locks.c b/fs/ceph/locks.c index 9c8dc8a55e7e..cb51c7e9c8e2 100644 --- a/fs/ceph/locks.c +++ b/fs/ceph/locks.c @@ -7,6 +7,7 @@ #include "super.h" #include "mds_client.h" +#include <linux/filelock.h> #include <linux/ceph/pagelist.h> static u64 lock_secret; |