diff options
author | J. Bruce Fields <bfields@redhat.com> | 2011-01-02 22:13:18 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2011-01-04 16:49:23 -0500 |
commit | da165dd60e136d0609e0a2c0c2a9b9a5372200d6 (patch) | |
tree | e6cb7540b6233d447be9ff29cc6a20c357249b35 /fs/nfsd/vfs.c | |
parent | 062304a815fe10068c478a4a3f28cf091c55cb82 (diff) |
nfsd: remove some unnecessary dropit handling
We no longer need a few of these special cases.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 184938fcff04..6a3af2ff3afe 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -380,8 +380,6 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap, | |||
380 | * we need to break all leases. | 380 | * we need to break all leases. |
381 | */ | 381 | */ |
382 | host_err = break_lease(inode, O_WRONLY | O_NONBLOCK); | 382 | host_err = break_lease(inode, O_WRONLY | O_NONBLOCK); |
383 | if (host_err == -EWOULDBLOCK) | ||
384 | host_err = -ETIMEDOUT; | ||
385 | if (host_err) /* ENOMEM or EWOULDBLOCK */ | 383 | if (host_err) /* ENOMEM or EWOULDBLOCK */ |
386 | goto out_nfserr; | 384 | goto out_nfserr; |
387 | 385 | ||
@@ -752,8 +750,6 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
752 | */ | 750 | */ |
753 | if (!(access & NFSD_MAY_NOT_BREAK_LEASE)) | 751 | if (!(access & NFSD_MAY_NOT_BREAK_LEASE)) |
754 | host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? O_WRONLY : 0)); | 752 | host_err = break_lease(inode, O_NONBLOCK | ((access & NFSD_MAY_WRITE) ? O_WRONLY : 0)); |
755 | if (host_err == -EWOULDBLOCK) | ||
756 | host_err = -ETIMEDOUT; | ||
757 | if (host_err) /* NOMEM or WOULDBLOCK */ | 753 | if (host_err) /* NOMEM or WOULDBLOCK */ |
758 | goto out_nfserr; | 754 | goto out_nfserr; |
759 | 755 | ||