diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:39:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 16:39:22 -0700 |
commit | b0e0c9e7f6d5764633e93944dafd896dd6097318 (patch) | |
tree | 668d9adb29cb566f6240e7bc51faaf564d3241ca /fs/nfsd | |
parent | dae816835e8d1276c9e50d9c4dba75b7705fe66c (diff) | |
parent | 53e6d8d182e97c5211da4ee1f163c840c7ecf8ca (diff) | |
download | kernel_samsung_tuna-b0e0c9e7f6d5764633e93944dafd896dd6097318.zip kernel_samsung_tuna-b0e0c9e7f6d5764633e93944dafd896dd6097318.tar.gz kernel_samsung_tuna-b0e0c9e7f6d5764633e93944dafd896dd6097318.tar.bz2 |
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
MAINTAINERS: mention lockd and sunrpc in nfs entries
lockd: trivial sparse endian annotations
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 33bfcf0..9dc036f 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -1023,7 +1023,7 @@ exp_export(struct nfsctl_export *nxp) /* Look up the dentry */ err = path_lookup(nxp->ex_path, 0, &nd); if (err) - goto out_unlock; + goto out_put_clp; err = -EINVAL; exp = exp_get_by_name(clp, nd.path.mnt, nd.path.dentry, NULL); @@ -1090,9 +1090,9 @@ finish: exp_put(exp); if (fsid_key && !IS_ERR(fsid_key)) cache_put(&fsid_key->h, &svc_expkey_cache); - if (clp) - auth_domain_put(clp); path_put(&nd.path); +out_put_clp: + auth_domain_put(clp); out_unlock: exp_writeunlock(); out: |