Commit 066dea8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents c7f396f1 3953704f

drivers/staging/lustre/lustre/ldlm/ldlm_flock.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ granted: 
		default:

			getlk->fl_type = F_UNLCK;

		}

		getlk->fl_pid = (pid_t)lock->l_policy_data.l_flock.pid;

		getlk->fl_pid = -(pid_t)lock->l_policy_data.l_flock.pid;

		getlk->fl_start = (loff_t)lock->l_policy_data.l_flock.start;

		getlk->fl_end = (loff_t)lock->l_policy_data.l_flock.end;

	} else {

fs/9p/vfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static int v9fs_file_getlock(struct file *filp, struct file_lock *fl) 
			fl->fl_end = OFFSET_MAX;

		else

			fl->fl_end = glock.start + glock.length - 1;

		fl->fl_pid = glock.proc_id;

		fl->fl_pid = -glock.proc_id;

	}

	kfree(glock.client_id);

	return res;

fs/ceph/locks.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int ceph_lock_message(u8 lock_type, u16 operation, struct file *file, 
	err = ceph_mdsc_do_request(mdsc, inode, req);



	if (operation == CEPH_MDS_OP_GETFILELOCK) {

		fl->fl_pid = le64_to_cpu(req->r_reply_info.filelock_reply->pid);

		fl->fl_pid = -le64_to_cpu(req->r_reply_info.filelock_reply->pid);

		if (CEPH_LOCK_SHARED == req->r_reply_info.filelock_reply->type)

			fl->fl_type = F_RDLCK;

		else if (CEPH_LOCK_EXCL == req->r_reply_info.filelock_reply->type)

fs/cifs/cifssmb.c

+1 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ CIFSSMBPosixLock(const unsigned int xid, struct cifs_tcon *tcon, 
			pLockData->fl_start = le64_to_cpu(parm_data->start);

			pLockData->fl_end = pLockData->fl_start +

					le64_to_cpu(parm_data->length) - 1;

			pLockData->fl_pid = le32_to_cpu(parm_data->pid);

			pLockData->fl_pid = -le32_to_cpu(parm_data->pid);

		}

	}

fs/dlm/plock.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, 
		locks_init_lock(fl);

		fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK;

		fl->fl_flags = FL_POSIX;

		fl->fl_pid = op->info.pid;

		fl->fl_pid = -op->info.pid;

		fl->fl_start = op->info.start;

		fl->fl_end = op->info.end;

		rv = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE