Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd973c4 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4/NLM: Push file locking BKL dependencies down into the NLM layer 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3f09df70

fs/lockd/clntproc.c

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl) 
	/* Set up the argument struct */

	nlmclnt_setlockargs(call, fl);



	lock_kernel();

	if (IS_SETLK(cmd) || IS_SETLKW(cmd)) {

		if (fl->fl_type != F_UNLCK) {

			call->a_args.block = IS_SETLKW(cmd) ? 1 : 0;
@@ -178,6 +179,7 @@ int nlmclnt_proc(struct nlm_host *host, int cmd, struct file_lock *fl) 


	fl->fl_ops->fl_release_private(fl);

	fl->fl_ops = NULL;

	unlock_kernel();



	dprintk("lockd: clnt proc returns %d\n", status);

	return status;

fs/nfs/file.c

+0 −6
Original line number Diff line number Diff line
@@ -592,7 +592,6 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) 
	struct inode *inode = filp->f_mapping->host;

	int status = 0;



	lock_kernel();

	/* Try local locking first */

	posix_test_lock(filp, fl);

	if (fl->fl_type != F_UNLCK) {
@@ -608,7 +607,6 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl) 


	status = NFS_PROTO(inode)->lock(filp, cmd, fl);

out:

	unlock_kernel();

	return status;

out_noconflict:

	fl->fl_type = F_UNLCK;
@@ -650,13 +648,11 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl) 
	 * 	If we're signalled while cleaning up locks on process exit, we

	 * 	still need to complete the unlock.

	 */

	lock_kernel();

	/* Use local locking if mounted with "-onolock" */

	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM))

		status = NFS_PROTO(inode)->lock(filp, cmd, fl);

	else

		status = do_vfs_lock(filp, fl);

	unlock_kernel();

	return status;

}
@@ -673,13 +669,11 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) 
	if (status != 0)

		goto out;



	lock_kernel();

	/* Use local locking if mounted with "-onolock" */

	if (!(NFS_SERVER(inode)->flags & NFS_MOUNT_NONLM))

		status = NFS_PROTO(inode)->lock(filp, cmd, fl);

	else

		status = do_vfs_lock(filp, fl);

	unlock_kernel();

	if (status < 0)

		goto out;

	/*