diff options
author | J. Bruce Fields <bfields@redhat.com> | 2012-10-11 12:40:00 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2012-10-11 12:41:05 -0400 |
commit | a9ca4043d074509b9d15003fbcb068d3cdae85a4 (patch) | |
tree | 7da7c54ea167f7c6786c2eac7a6aecff97c77322 /fs/nfs/nfs4proc.c | |
parent | f474af7051212b4efc8267583fad9c4ebf33ccff (diff) | |
parent | 62d98c935456ee121b03d6a68aa3091a04085b7e (diff) | |
download | op-kernel-dev-a9ca4043d074509b9d15003fbcb068d3cdae85a4.zip op-kernel-dev-a9ca4043d074509b9d15003fbcb068d3cdae85a4.tar.gz |
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/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1e50326..ddfebb12 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; } |