Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index f732541..0e28189 100644 (file)
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -52,8 +52,7 @@ nfs_put_unlinkdata(struct nfs_unlinkdata *data)
 {
        if (--data->count == 0) {
                nfs_detach_unlinkdata(data);
-               if (data->name.name != NULL)
-                       kfree(data->name.name);
+               kfree(data->name.name);
                kfree(data);
        }
 }
@@ -88,10 +87,9 @@ nfs_copy_dname(struct dentry *dentry, struct nfs_unlinkdata *data)
  * We delay initializing RPC info until after the call to dentry_iput()
  * in order to minimize races against rename().
  */
-static void
-nfs_async_unlink_init(struct rpc_task *task)
+static void nfs_async_unlink_init(struct rpc_task *task, void *calldata)
 {
-       struct nfs_unlinkdata   *data = (struct nfs_unlinkdata *)task->tk_calldata;
+       struct nfs_unlinkdata   *data = calldata;
        struct dentry           *dir = data->dir;
        struct rpc_message      msg = {
                .rpc_cred       = data->cred,
@@ -117,10 +115,9 @@ nfs_async_unlink_init(struct rpc_task *task)
  *
  * Do the directory attribute update.
  */
-static void
-nfs_async_unlink_done(struct rpc_task *task)
+static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
 {
-       struct nfs_unlinkdata   *data = (struct nfs_unlinkdata *)task->tk_calldata;
+       struct nfs_unlinkdata   *data = calldata;
        struct dentry           *dir = data->dir;
        struct inode            *dir_i;
 
@@ -142,13 +139,18 @@ nfs_async_unlink_done(struct rpc_task *task)
  * We need to call nfs_put_unlinkdata as a 'tk_release' task since the
  * rpc_task would be freed too.
  */
-static void
-nfs_async_unlink_release(struct rpc_task *task)
+static void nfs_async_unlink_release(void *calldata)
 {
-       struct nfs_unlinkdata   *data = (struct nfs_unlinkdata *)task->tk_calldata;
+       struct nfs_unlinkdata   *data = calldata;
        nfs_put_unlinkdata(data);
 }
 
+static const struct rpc_call_ops nfs_unlink_ops = {
+       .rpc_call_prepare = nfs_async_unlink_init,
+       .rpc_call_done = nfs_async_unlink_done,
+       .rpc_release = nfs_async_unlink_release,
+};
+
 /**
  * nfs_async_unlink - asynchronous unlinking of a file
  * @dentry: dentry to unlink
@@ -158,14 +160,12 @@ nfs_async_unlink(struct dentry *dentry)
 {
        struct dentry   *dir = dentry->d_parent;
        struct nfs_unlinkdata   *data;
-       struct rpc_task *task;
        struct rpc_clnt *clnt = NFS_CLIENT(dir->d_inode);
        int             status = -ENOMEM;
 
-       data = kmalloc(sizeof(*data), GFP_KERNEL);
+       data = kzalloc(sizeof(*data), GFP_KERNEL);
        if (!data)
                goto out;
-       memset(data, 0, sizeof(*data));
 
        data->cred = rpcauth_lookupcred(clnt->cl_auth, 0);
        if (IS_ERR(data->cred)) {
@@ -179,17 +179,13 @@ nfs_async_unlink(struct dentry *dentry)
        nfs_deletes = data;
        data->count = 1;
 
-       task = &data->task;
-       rpc_init_task(task, clnt, nfs_async_unlink_done , RPC_TASK_ASYNC);
-       task->tk_calldata = data;
-       task->tk_action = nfs_async_unlink_init;
-       task->tk_release = nfs_async_unlink_release;
+       rpc_init_task(&data->task, clnt, RPC_TASK_ASYNC, &nfs_unlink_ops, data);
 
        spin_lock(&dentry->d_lock);
        dentry->d_flags |= DCACHE_NFSFS_RENAMED;
        spin_unlock(&dentry->d_lock);
 
-       rpc_sleep_on(&nfs_delete_queue, task, NULL, NULL);
+       rpc_sleep_on(&nfs_delete_queue, &data->task, NULL, NULL);
        status = 0;
  out:
        return status;