summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2012-10-11 12:40:00 -0400
committerJ. Bruce Fields <bfields@redhat.com>2012-10-11 12:41:05 -0400
commita9ca4043d074509b9d15003fbcb068d3cdae85a4 (patch)
tree7da7c54ea167f7c6786c2eac7a6aecff97c77322 /fs
parentf474af7051212b4efc8267583fad9c4ebf33ccff (diff)
parent62d98c935456ee121b03d6a68aa3091a04085b7e (diff)
downloadlinux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.tar.gz
linux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.tar.bz2
linux-a9ca4043d074509b9d15003fbcb068d3cdae85a4.zip
Merge Trond's bugfixes
Merge branch 'bugfixes' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.7-incoming. Mainly needed for Bryan's "SUNRPC: Set alloc_slot for backchannel tcp ops", without which the 4.1 server oopses.
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4namespace.c4
-rw-r--r--fs/nfs/nfs4proc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c
index 017b4b01a69c..4fdeb1b7042e 100644
--- a/fs/nfs/nfs4namespace.c
+++ b/fs/nfs/nfs4namespace.c
@@ -198,14 +198,14 @@ struct rpc_clnt *nfs4_create_sec_client(struct rpc_clnt *clnt, struct inode *ino
flavor = nfs4_negotiate_security(inode, name);
if ((int)flavor < 0)
- return ERR_PTR(flavor);
+ return ERR_PTR((int)flavor);
clone = rpc_clone_client(clnt);
if (IS_ERR(clone))
return clone;
auth = rpcauth_create(flavor, clone);
- if (!auth) {
+ if (IS_ERR(auth)) {
rpc_shutdown_client(clone);
clone = ERR_PTR(-EIO);
}
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1e50326d00dd..ddfebb128017 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2399,7 +2399,7 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
int ret;
auth = rpcauth_create(flavor, server->client);
- if (!auth) {
+ if (IS_ERR(auth)) {
ret = -EIO;
goto out;
}