commit d1e284d50a1506aab8ad7895f31b5f93b5647fc9
author Trond Myklebust <Trond.Myklebust@netapp.com> Tue Jan 17 22:04:24 2012 -0500
committer Trond Myklebust <Trond.Myklebust@netapp.com> Tue Jan 31 18:20:28 2012 -0500
tree 128f19f0646c77d4de820e39f0a724ce37ae1d57
parent 1313e6034a73a55d6293dbdc62b8853dd067771a

NFSv4: Clean up nfs4_get_state_owner

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f0c849c..53ef365 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1754,7 +1754,8 @@
 
 	/* Protect against reboot recovery conflicts */
 	status = -ENOMEM;
-	if (!(sp = nfs4_get_state_owner(server, cred))) {
+	sp = nfs4_get_state_owner(server, cred, GFP_KERNEL);
+	if (sp == NULL) {
 		dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n");
 		goto out_err;
 	}