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/proc | |
| parent | Merge tag 'tpm-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jar... (diff) | |
| parent | fs: remove locks_inode (diff) | |
| download | linux-575a7e0f812a4968ad1e0c00026692ede040e13f.tar.gz linux-575a7e0f812a4968ad1e0c00026692ede040e13f.tar.bz2 linux-575a7e0f812a4968ad1e0c00026692ede040e13f.zip | |
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/proc')
| -rw-r--r-- | fs/proc/fd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/proc/fd.c b/fs/proc/fd.c index fc46d6fe080c..53e4919ef860 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -12,6 +12,7 @@ #include <linux/file.h> #include <linux/seq_file.h> #include <linux/fs.h> +#include <linux/filelock.h> #include <linux/proc_fs.h> |