diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-04-05 03:12:21 -0400 |
commit | 4e29402fe4b2006c994eed5020c42b2cc87d9b42 (patch) | |
tree | c0229c107045ab21487729f6a6cab6b70ed30bfa /fs/nfs/namespace.c | |
parent | f8852b12200df393b0a4db1a7052454bbc335443 (diff) | |
parent | 00b317a41c5428b13eb7e5b4bbc691b1aa7afa80 (diff) |
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Diffstat (limited to 'fs/nfs/namespace.c')
-rw-r--r-- | fs/nfs/namespace.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index ad92bf731ff5..9166fcb66da2 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c | |||
@@ -192,13 +192,15 @@ static rpc_authflavor_t nfs_lookup_with_sec(struct nfs_server *server, struct de | |||
192 | auth = rpcauth_create(flavor, clone); | 192 | auth = rpcauth_create(flavor, clone); |
193 | if (!auth) { | 193 | if (!auth) { |
194 | flavor = -EIO; | 194 | flavor = -EIO; |
195 | goto out; | 195 | goto out_shutdown; |
196 | } | 196 | } |
197 | err = server->nfs_client->rpc_ops->lookup(clone, parent->d_inode, | 197 | err = server->nfs_client->rpc_ops->lookup(clone, parent->d_inode, |
198 | &path->dentry->d_name, | 198 | &path->dentry->d_name, |
199 | fh, fattr); | 199 | fh, fattr); |
200 | if (err < 0) | 200 | if (err < 0) |
201 | flavor = err; | 201 | flavor = err; |
202 | out_shutdown: | ||
203 | rpc_shutdown_client(clone); | ||
202 | out: | 204 | out: |
203 | return flavor; | 205 | return flavor; |
204 | } | 206 | } |