summaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-18 04:04:24 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-02-01 00:20:28 +0100
commitd1e284d50a1506aab8ad7895f31b5f93b5647fc9 (patch)
tree128f19f0646c77d4de820e39f0a724ce37ae1d57 /fs/nfs/nfs4proc.c
parentNFS: Remove unnecessary includes from linux/nfs_fs_i.h (diff)
downloadlinux-d1e284d50a1506aab8ad7895f31b5f93b5647fc9.tar.xz
linux-d1e284d50a1506aab8ad7895f31b5f93b5647fc9.zip
NFSv4: Clean up nfs4_get_state_owner
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f0c849c98fe4..53ef365f4372 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1754,7 +1754,8 @@ static int _nfs4_do_open(struct inode *dir, struct dentry *dentry, fmode_t fmode
/* 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;
}