SUNRPC: Clean up the sillyrename code

Fix a couple of bugs:
 - Don't rely on the parent dentry still being valid when the call completes.
   Fixes a race with shrink_dcache_for_umount_subtree()

 - Don't remove the file if the filehandle has been labelled as stale.

Fix a couple of inefficiencies
 - Remove the global list of sillyrenamed files. Instead we can cache the
   sillyrename information in the dentry->d_fsdata
 - Move common code from unlink_setup/unlink_done into fs/nfs/unlink.c

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 21 deletions

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 3b3eb692e0f..845cdde1d8b 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -291,32 +291,16 @@ nfs_proc_remove(struct inode *dir, struct qstr *name)
         return status;
 }
 
-static int
-nfs_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *name)
+static void
+nfs_proc_unlink_setup(struct rpc_message *msg, struct inode *dir)
 {
-        struct nfs_removeargs *arg;
-
-        arg = kmalloc(sizeof(*arg), GFP_KERNEL);
-        if (!arg)
-                return -ENOMEM;
-        arg->fh = NFS_FH(dir->d_inode);
-        arg->name.name = name->name;
-        arg->name.len = name->len;
         msg->rpc_proc = &nfs_procedures[NFSPROC_REMOVE];
-        msg->rpc_argp = arg;
-        return 0;
 }
 
-static int
-nfs_proc_unlink_done(struct dentry *dir, struct rpc_task *task)
+static int nfs_proc_unlink_done(struct rpc_task *task, struct inode *dir)
 {
-        struct rpc_message *msg = &task->tk_msg;
-        
-        if (msg->rpc_argp) {
-                nfs_mark_for_revalidate(dir->d_inode);
-                kfree(msg->rpc_argp);
-        }
-        return 0;
+        nfs_mark_for_revalidate(dir);
+        return 1;
 }
 
 static int