summaryrefslogtreecommitdiff
path: root/fs/nfs/unlink.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-22 16:28:19 +0000
committerSteve French <sfrench@us.ibm.com>2007-10-22 16:28:19 +0000
commit7efb35af738e96565934cc640d863eb18dba0206 (patch)
tree29ed331d864b0cfa73fdca5fd3982896e56f9530 /fs/nfs/unlink.c
parent748c5151deb56e4b7b5a9b07a884243764933831 (diff)
parent55b70a0300b873c0ec7ea6e33752af56f41250ce (diff)
downloadlinux-next-7efb35af738e96565934cc640d863eb18dba0206.tar.gz
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/nfs/unlink.c')
-rw-r--r--fs/nfs/unlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index ce558c2e4d53..233ad38161f9 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -171,7 +171,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
if (parent == NULL)
goto out_free;
dir = parent->d_inode;
- if (nfs_copy_dname(dentry, data) == 0)
+ if (nfs_copy_dname(dentry, data) != 0)
goto out_dput;
/* Non-exclusive lock protects against concurrent lookup() calls */
spin_lock(&dir->i_lock);