diff --git a/[refs] b/[refs] index 1312705c9838..3f225b5a5953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bad2a524113075d1e0665f1e111283ab25135ade +refs/heads/master: 55b70a0300b873c0ec7ea6e33752af56f41250ce diff --git a/trunk/fs/nfs/unlink.c b/trunk/fs/nfs/unlink.c index ce558c2e4d53..233ad38161f9 100644 --- a/trunk/fs/nfs/unlink.c +++ b/trunk/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);