diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-07-31 20:29:07 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-08-04 04:06:43 +0200 |
| commit | a6f03393ec86fd25523c79497a9a773bda170d1d (patch) | |
| tree | 7f13e1ebc1929fff17bda33c3bfb333979d03ac0 /fs/nfs | |
| parent | NFSv4: Clean up the process of renewing the NFSv4 lease (diff) | |
| download | linux-a6f03393ec86fd25523c79497a9a773bda170d1d.tar.xz linux-a6f03393ec86fd25523c79497a9a773bda170d1d.zip | |
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>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 10 |
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) struct nfs4_opendata *data = calldata; data->rpc_status = task->tk_status; - if (RPC_ASSASSINATED(task)) - return; if (data->rpc_status == 0) { memcpy(data->o_res.stateid.data, data->c_res.stateid.data, sizeof(data->o_res.stateid.data)); @@ -1408,8 +1406,6 @@ static void nfs4_open_done(struct rpc_task *task, void *calldata) if (!nfs4_sequence_done(task, &data->o_res.seq_res)) return; - if (RPC_ASSASSINATED(task)) - return; if (task->tk_status == 0) { switch (data->o_res.f_attr->mode & S_IFMT) { case S_IFREG: @@ -1860,8 +1856,6 @@ static void nfs4_close_done(struct rpc_task *task, void *data) if (!nfs4_sequence_done(task, &calldata->res.seq_res)) return; - if (RPC_ASSASSINATED(task)) - return; /* hmm. we are done with the inode, and in the process of freeing * the state_owner. we keep this around to process errors */ @@ -3907,8 +3901,6 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) if (!nfs4_sequence_done(task, &calldata->res.seq_res)) return; - if (RPC_ASSASSINATED(task)) - return; switch (task->tk_status) { case 0: memcpy(calldata->lsp->ls_stateid.data, @@ -4119,8 +4111,6 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) return; data->rpc_status = task->tk_status; - if (RPC_ASSASSINATED(task)) - goto out; if (data->arg.new_lock_owner != 0) { if (data->rpc_status == 0) nfs_confirm_seqid(&data->lsp->ls_seqid, 0); |