aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-07-31 14:29:07 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-08-03 22:06:43 -0400
commita6f03393ec86fd25523c79497a9a773bda170d1d (patch)
tree7f13e1ebc1929fff17bda33c3bfb333979d03ac0
parent452e93523d9433f83670e7b42cbe75319c208762 (diff)
NFSv4: Get rid of the bogus RPC_ASSASSINATED(task) checks
There is no real reason to have RPC_ASSASSINATED() checks in the NFS code. As far as it is concerned, this is just an RPC error... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/nfs4proc.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d2d20fbeb086..101bf403f507 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1275,8 +1275,6 @@ static void nfs4_open_confirm_done(struct rpc_task *task, void *calldata)
1275 struct nfs4_opendata *data = calldata; 1275 struct nfs4_opendata *data = calldata;
1276 1276
1277 data->rpc_status = task->tk_status; 1277 data->rpc_status = task->tk_status;
1278 if (RPC_ASSASSINATED(task))
1279 return;
1280 if (data->rpc_status == 0) { 1278 if (data->rpc_status == 0) {
1281 memcpy(data->o_res.stateid.data, data->c_res.stateid.data, 1279 memcpy(data->o_res.stateid.data, data->c_res.stateid.data,
1282 sizeof(data->o_res.stateid.data)); 1280 sizeof(data->o_res.stateid.data));
@@ -1408,8 +1406,6 @@ static void nfs4_open_done(struct rpc_task *task, void *calldata)
1408 if (!nfs4_sequence_done(task, &data->o_res.seq_res)) 1406 if (!nfs4_sequence_done(task, &data->o_res.seq_res))
1409 return; 1407 return;
1410 1408
1411 if (RPC_ASSASSINATED(task))
1412 return;
1413 if (task->tk_status == 0) { 1409 if (task->tk_status == 0) {
1414 switch (data->o_res.f_attr->mode & S_IFMT) { 1410 switch (data->o_res.f_attr->mode & S_IFMT) {
1415 case S_IFREG: 1411 case S_IFREG:
@@ -1860,8 +1856,6 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
1860 1856
1861 if (!nfs4_sequence_done(task, &calldata->res.seq_res)) 1857 if (!nfs4_sequence_done(task, &calldata->res.seq_res))
1862 return; 1858 return;
1863 if (RPC_ASSASSINATED(task))
1864 return;
1865 /* hmm. we are done with the inode, and in the process of freeing 1859 /* hmm. we are done with the inode, and in the process of freeing
1866 * the state_owner. we keep this around to process errors 1860 * the state_owner. we keep this around to process errors
1867 */ 1861 */
@@ -3907,8 +3901,6 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
3907 3901
3908 if (!nfs4_sequence_done(task, &calldata->res.seq_res)) 3902 if (!nfs4_sequence_done(task, &calldata->res.seq_res))
3909 return; 3903 return;
3910 if (RPC_ASSASSINATED(task))
3911 return;
3912 switch (task->tk_status) { 3904 switch (task->tk_status) {
3913 case 0: 3905 case 0:
3914 memcpy(calldata->lsp->ls_stateid.data, 3906 memcpy(calldata->lsp->ls_stateid.data,
@@ -4119,8 +4111,6 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata)
4119 return; 4111 return;
4120 4112
4121 data->rpc_status = task->tk_status; 4113 data->rpc_status = task->tk_status;
4122 if (RPC_ASSASSINATED(task))
4123 goto out;
4124 if (data->arg.new_lock_owner != 0) { 4114 if (data->arg.new_lock_owner != 0) {
4125 if (data->rpc_status == 0) 4115 if (data->rpc_status == 0)
4126 nfs_confirm_seqid(&data->lsp->ls_seqid, 0); 4116 nfs_confirm_seqid(&data->lsp->ls_seqid, 0);