Messages in this thread Patch in this message | | | From | Jeff Layton <> | Subject | [RFC PATCH v2 5/5] locks: report l_pid as -1 for FL_FILP_PRIVATE locks | Date | Wed, 20 Nov 2013 11:45:06 -0500 |
| |
FL_FILP_PRIVATE locks are no longer tied to a particular PID, and are instead inheritable by child processes. Report a l_pid of '-1' for these sorts of locks since the pid is somewhat meaningless for them.
Signed-off-by: Jeff Layton <jlayton@redhat.com> --- fs/locks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c index d5fb853..8a4d4e4 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1889,7 +1889,7 @@ EXPORT_SYMBOL_GPL(vfs_test_lock); static int posix_lock_to_flock(struct flock *flock, struct file_lock *fl) { - flock->l_pid = fl->fl_pid; + flock->l_pid = IS_FILP_PVT(fl) ? -1 : fl->fl_pid; #if BITS_PER_LONG == 32 /* * Make sure we can represent the posix lock via @@ -1911,7 +1911,7 @@ static int posix_lock_to_flock(struct flock *flock, struct file_lock *fl) #if BITS_PER_LONG == 32 static void posix_lock_to_flock64(struct flock64 *flock, struct file_lock *fl) { - flock->l_pid = fl->fl_pid; + flock->l_pid = IS_FILP_PVT(fl) ? -1 : fl->fl_pid; flock->l_start = fl->fl_start; flock->l_len = fl->fl_end == OFFSET_MAX ? 0 : fl->fl_end - fl->fl_start + 1; -- 1.8.3.1
| |