vfs: trivial __d_lookup_rcu() cleanups
[linux-2.6.git] / fs / nfs / unlink.c
index 981298c..4f9319a 100644 (file)
@@ -87,7 +87,7 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
        struct inode *dir = data->dir;
 
        if (!NFS_PROTO(dir)->unlink_done(task, dir))
-               nfs_restart_rpc(task, NFS_SERVER(dir)->nfs_client);
+               rpc_restart_call_prepare(task);
 }
 
 /**
@@ -147,7 +147,7 @@ static int nfs_do_call_unlink(struct dentry *parent, struct inode *dir, struct n
 
        alias = d_lookup(parent, &data->args.name);
        if (alias != NULL) {
-               int ret = 0;
+               int ret;
                void *devname_garbage = NULL;
 
                /*
@@ -155,14 +155,16 @@ static int nfs_do_call_unlink(struct dentry *parent, struct inode *dir, struct n
                 * the sillyrename information to the aliased dentry.
                 */
                nfs_free_dname(data);
+               ret = nfs_copy_dname(alias, data);
                spin_lock(&alias->d_lock);
-               if (alias->d_inode != NULL &&
+               if (ret == 0 && alias->d_inode != NULL &&
                    !(alias->d_flags & DCACHE_NFSFS_RENAMED)) {
                        devname_garbage = alias->d_fsdata;
                        alias->d_fsdata = data;
                        alias->d_flags |= DCACHE_NFSFS_RENAMED;
                        ret = 1;
-               }
+               } else
+                       ret = 0;
                spin_unlock(&alias->d_lock);
                nfs_dec_sillycount(dir);
                dput(alias);
@@ -171,8 +173,7 @@ static int nfs_do_call_unlink(struct dentry *parent, struct inode *dir, struct n
                 * point dentry is definitely not a root, so we won't need
                 * that anymore.
                 */
-               if (devname_garbage)
-                       kfree(devname_garbage);
+               kfree(devname_garbage);
                return ret;
        }
        data->dir = igrab(dir);
@@ -204,8 +205,6 @@ 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)
-               goto out_dput;
        /* Non-exclusive lock protects against concurrent lookup() calls */
        spin_lock(&dir->i_lock);
        if (atomic_inc_not_zero(&NFS_I(dir)->silly_count) == 0) {
@@ -366,19 +365,21 @@ static void nfs_async_rename_done(struct rpc_task *task, void *calldata)
        struct nfs_renamedata *data = calldata;
        struct inode *old_dir = data->old_dir;
        struct inode *new_dir = data->new_dir;
+       struct dentry *old_dentry = data->old_dentry;
+       struct dentry *new_dentry = data->new_dentry;
 
        if (!NFS_PROTO(old_dir)->rename_done(task, old_dir, new_dir)) {
-               nfs_restart_rpc(task, NFS_SERVER(old_dir)->nfs_client);
+               rpc_restart_call_prepare(task);
                return;
        }
 
        if (task->tk_status != 0) {
-               nfs_cancel_async_unlink(data->old_dentry);
+               nfs_cancel_async_unlink(old_dentry);
                return;
        }
 
-       nfs_set_verifier(data->old_dentry, nfs_save_change_attribute(old_dir));
-       d_move(data->old_dentry, data->new_dentry);
+       d_drop(old_dentry);
+       d_drop(new_dentry);
 }
 
 /**
@@ -568,6 +569,14 @@ nfs_sillyrename(struct inode *dir, struct dentry *dentry)
        if (error)
                goto out_dput;
 
+       /* populate unlinkdata with the right dname */
+       error = nfs_copy_dname(sdentry,
+                               (struct nfs_unlinkdata *)dentry->d_fsdata);
+       if (error) {
+               nfs_cancel_async_unlink(dentry);
+               goto out_dput;
+       }
+
        /* run the rename task, undo unlink if it fails */
        task = nfs_async_rename(dir, dir, dentry, sdentry);
        if (IS_ERR(task)) {