aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/idmap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-08-24 22:29:46 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-08-24 22:29:46 -0700
commit62250b3bb596ffbae17c4b3d865fecd6329ce8b3 (patch)
tree8f18da918c319a1f0be6c4011b60091bb29dc007 /fs/nfs/idmap.c
parentMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff)
parentVFS: Remove redundant open-coded mode bit checks in open_exec(). (diff)
downloadlinux-dev-62250b3bb596ffbae17c4b3d865fecd6329ce8b3.tar.xz
linux-dev-62250b3bb596ffbae17c4b3d865fecd6329ce8b3.zip
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/nfs/idmap.c')
-rw-r--r--fs/nfs/idmap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index b81e7ed3c902..07a5dd57646e 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -130,9 +130,7 @@ nfs_idmap_delete(struct nfs4_client *clp)
if (!idmap)
return;
- dput(idmap->idmap_dentry);
- idmap->idmap_dentry = NULL;
- rpc_unlink(idmap->idmap_path);
+ rpc_unlink(idmap->idmap_dentry);
clp->cl_idmap = NULL;
kfree(idmap);
}