From b48d09f88f7453124ee58ce010bf5a92c034e91e Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 21 Sep 2010 16:52:40 -0400 Subject: [PATCH] --- yaml --- r: 217045 b: refs/heads/master c: f7732d6573c4f29fc1ca5d384bbf82ddfa115030 h: refs/heads/master i: 217043: 93f43697e91770b97365c507b438ee701d730c08 v: v3 --- [refs] | 2 +- trunk/fs/nfs/unlink.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8096439a9a12..7ddd65b7e1f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3d4152a5d59af9e13a73efa9e9c24383fbe307f +refs/heads/master: f7732d6573c4f29fc1ca5d384bbf82ddfa115030 diff --git a/trunk/fs/nfs/unlink.c b/trunk/fs/nfs/unlink.c index 698b3e6367ff..47530aacebfd 100644 --- a/trunk/fs/nfs/unlink.c +++ b/trunk/fs/nfs/unlink.c @@ -426,7 +426,6 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, .rpc_client = NFS_CLIENT(old_dir), .flags = RPC_TASK_ASYNC, }; - struct rpc_task *task; data = kmalloc(sizeof(*data), GFP_KERNEL); if (data == NULL) @@ -435,7 +434,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, data->cred = rpc_lookup_cred(); if (IS_ERR(data->cred)) { - task = (struct rpc_task *)data->cred; + struct rpc_task *task = ERR_CAST(data->cred); kfree(data); return task; } @@ -468,11 +467,7 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir, NFS_PROTO(data->old_dir)->rename_setup(&msg, old_dir); - task = rpc_run_task(&task_setup_data); - if (IS_ERR(task)) - nfs_async_rename_release(data); - - return task; + return rpc_run_task(&task_setup_data); } /**