lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nfsd: remove some unnecessary dropit handling

Browse Source 
We no longer need a few of these special cases.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields
2011-01-02 22:13:18 -05:00
parent 062304a815
commit da165dd60e
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View File

@@ -1156,10 +1156,6 @@ encode_op:
nfsd4_increment_op_stats(op->opnum); nfsd4_increment_op_stats(op->opnum);
} }
if (!rqstp->rq_usedeferral && status == nfserr_dropit) {
dprintk("%s Dropit - send NFS4ERR_DELAY\n", __func__);
status = nfserr_jukebox;
}
resp->cstate.status = status; resp->cstate.status = status;
fh_put(&resp->cstate.current_fh); fh_put(&resp->cstate.current_fh);

2
fs/nfsd/nfs4state.c
View File

@@ -2509,8 +2509,6 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file
if (!fp->fi_fds[oflag]) { if (!fp->fi_fds[oflag]) {
status = nfsd_open(rqstp, cur_fh, S_IFREG, access, status = nfsd_open(rqstp, cur_fh, S_IFREG, access,
&fp->fi_fds[oflag]); &fp->fi_fds[oflag]);
if (status == nfserr_dropit)
status = nfserr_jukebox;
if (status) if (status)
return status; return status;
} }

2
fs/nfsd/nfs4xdr.c
View File

@@ -2328,8 +2328,6 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
case nfserr_resource: case nfserr_resource:
nfserr = nfserr_toosmall; nfserr = nfserr_toosmall;
goto fail; goto fail;
case nfserr_dropit:
goto fail;
case nfserr_noent: case nfserr_noent:
goto skip_entry; goto skip_entry;
default: default:

4
fs/nfsd/vfs.c
View File

@@ -380,8 +380,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
* we need to break all leases. * we need to break all leases.
*/ */
host_err = break_lease(inode, O_WRONLY | O_NONBLOCK); host_err = break_lease(inode, O_WRONLY | O_NONBLOCK);
if (host_err == -EWOULDBLOCK)
host_err = -ETIMEDOUT;
if (host_err) /* ENOMEM or EWOULDBLOCK */ if (host_err) /* ENOMEM or EWOULDBLOCK */
goto out_nfserr; goto out_nfserr;
@@ -752,8 +750,6 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
*/ */
if (!(access & NFSD_MAY_NOT_BREAK_LEASE)) if (!(access & NFSD_MAY_NOT_BREAK_LEASE))
host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? O_WRONLY : 0)); host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? O_WRONLY : 0));
if (host_err == -EWOULDBLOCK)
host_err = -ETIMEDOUT;
if (host_err) /* NOMEM or WOULDBLOCK */ if (host_err) /* NOMEM or WOULDBLOCK */
goto out_nfserr; goto out_nfserr;