diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 13:22:58 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 13:22:58 -0700 |
| commit | d5122201a7f90b2aa73092f158b84d1d74f1134d (patch) | |
| tree | 7d2c55cd74dd31b5977861d0bc71b31424dc68ed /fs/nfs/delegation.c | |
| parent | 01c3f05228ce7fc19baa103e4e4bf6c1b5062a53 (diff) | |
| download | kernel_samsung_smdk4412-d5122201a7f90b2aa73092f158b84d1d74f1134d.zip kernel_samsung_smdk4412-d5122201a7f90b2aa73092f158b84d1d74f1134d.tar.gz kernel_samsung_smdk4412-d5122201a7f90b2aa73092f158b84d1d74f1134d.tar.bz2 | |
NFSv4: Move error handling out of the delegation generic code
The NFSv4 delegation recovery code is required by the protocol to handle
more errors. Rather than add NFSv4.0 specific errors into 'generic'
delegation code, we should move the error handling into the NFSv4 layer.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/delegation.c')
| -rw-r--r-- | fs/nfs/delegation.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 968225a..d4f669f 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -68,7 +68,7 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ { struct inode *inode = state->inode; struct file_lock *fl; - int status; + int status = 0; for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) { if (!(fl->fl_flags & (FL_POSIX|FL_FLOCK))) @@ -76,21 +76,9 @@ static int nfs_delegation_claim_locks(struct nfs_open_context *ctx, struct nfs4_ if (nfs_file_open_context(fl->fl_file) != ctx) continue; status = nfs4_lock_delegation_recall(state, fl); - if (status >= 0) - continue; - switch (status) { - default: - printk(KERN_ERR "%s: unhandled error %d.\n", - __func__, status); - case -NFS4ERR_EXPIRED: - /* kill_proc(fl->fl_pid, SIGLOST, 1); */ - case -NFS4ERR_STALE_CLIENTID: - nfs4_schedule_state_recovery(NFS_SERVER(inode)->nfs_client); - goto out_err; - } + if (status < 0) + break; } - return 0; -out_err: return status; } |