Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 4e0578121d9a..3eec30000f3f 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1066,9 +1066,11 @@ exp_pseudoroot(struct auth_domain *clp, struct svc_fh *fhp,
                 rv = nfserr_perm;
         else if (IS_ERR(exp))
                 rv = nfserrno(PTR_ERR(exp));
-        else
+        else {
                 rv = fh_compose(fhp, exp,
                                 fsid_key->ek_dentry, NULL);
+                exp_put(exp);
+        }
         cache_put(&fsid_key->h, &svc_expkey_cache);
         return rv;
 }