[POWERPC] CPM: Rename commproc to cpm1 and cpm2_common.c to cpm2.c

[linux-2.6] / fs / nfs / unlink.c

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 6ecd46c967c8bc3073cc3389ec65d32524d23e9d..233ad38161f924095e12e26ed4955337b16cdec6 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -11,7 +11,8 @@
 #include <linux/sunrpc/sched.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/nfs_fs.h>
-
+#include <linux/sched.h>
+#include <linux/wait.h>
 
 struct nfs_unlinkdata {
        struct hlist_node list;
@@ -170,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);