From: Jeff Layton Date: Mon, 3 Feb 2014 17:13:09 +0000 (-0500) Subject: locks: report l_pid as -1 for FL_FILE_PVT locks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=526625732179fa722dd55ae9165bb9855cf8e2a5;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git locks: report l_pid as -1 for FL_FILE_PVT locks FL_FILE_PVT 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. This precedent comes from FreeBSD. There, POSIX and flock() locks can conflict with one another. If fcntl(F_GETLK, ...) returns a lock set with flock() then the l_pid member cannot be a process ID because the lock is not held by a process as such. Acked-by: J. Bruce Fields Signed-off-by: Jeff Layton Change-Id: I7d702fcaaaf8592356926d51b60e53ee217ca747 Signed-off-by: Kevin F. Haggerty --- diff --git a/fs/locks.c b/fs/locks.c index c4a9c7a17fa..da11d6fab46 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1687,7 +1687,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_FILE_PVT(fl) ? -1 : fl->fl_pid; #if BITS_PER_LONG == 32 /* * Make sure we can represent the posix lock via @@ -1709,7 +1709,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_FILE_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;