1 files changed, 12 insertions, 28 deletions

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 7be0ee2782cb..845cdde1d8b7 100644
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -272,14 +272,14 @@ nfs_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr,
 static int
 nfs_proc_remove(struct inode *dir, struct qstr *name)
 {
-        struct nfs_diropargs    arg = {
-                .fh             = NFS_FH(dir),
-                .name           = name->name,
-                .len            = name->len
+        struct nfs_removeargs arg = {
+                .fh = NFS_FH(dir),
+                .name.len = name->len,
+                .name.name = name->name,
         };
-        struct rpc_message      msg = { 
-                .rpc_proc       = &nfs_procedures[NFSPROC_REMOVE],
-                .rpc_argp       = &arg,
+        struct rpc_message msg = { 
+                .rpc_proc = &nfs_procedures[NFSPROC_REMOVE],
+                .rpc_argp = &arg,
         };
         int                     status;
 
@@ -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_diropargs    *arg;
-
-        arg = kmalloc(sizeof(*arg), GFP_KERNEL);
-        if (!arg)
-                return -ENOMEM;
-        arg->fh = NFS_FH(dir->d_inode);
-        arg->name = name->name;
-        arg->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