diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 13:43:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-06 13:43:26 -0700 |
| commit | 066dea8c30ae7d8e061145bcf5422ce0773582eb (patch) | |
| tree | 2de9df544b2961bb5a6690978908e7749c7f19c0 /include | |
| parent | c7f396f12fb3644ff325acb2384b64c8eea7a746 (diff) | |
| parent | 3953704fde7ec47f452ce6446fb7a0d5dc2f74df (diff) | |
Merge tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking updates from Jeff Layton:
"This pile just has a few file locking fixes from Ben Coddington. There
are a couple of cleanup patches + an attempt to bring sanity to the
l_pid value that is reported back to userland on an F_GETLK request.
After a few gyrations, he came up with a way for filesystems to
communicate to the VFS layer code whether the pid should be translated
according to the namespace or presented as-is to userland"
* tag 'locks-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
locks: restore a warn for leaked locks on close
fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks
fs/locks: Use allocation rather than the stack in fcntl_getlk()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 495b5c2e430e..0a51a8b197f7 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1002,7 +1002,6 @@ struct file_lock { unsigned char fl_type; unsigned int fl_pid; int fl_link_cpu; /* what cpu's list is this on? */ - struct pid *fl_nspid; wait_queue_head_t fl_wait; struct file *fl_file; loff_t fl_start; |