UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd4: remove unneeded CLAIM_DELEGATE_CUR workaround 

0c12eaffdf "nfsd: don't break lease on
CLAIM_DELEGATE_CUR" was a temporary workaround for a problem fixed
properly in the vfs layer by 778fc546f7
"locks: fix tracking of inprogress lease breaks", so we can revert that
change (but keeping some minor cleanup from that commit).

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2011-10-19 11:42:03 -04:00
parent 856121b2e8
commit a8d86cd75b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfsd/nfs4state.c
View File

@ -2653,12 +2653,6 @@ static __be32 nfs4_get_vfs_file(struct svc_rqst *rqstp, struct nfs4_file *fp,
int oflag = nfs4_access_to_omode(open->op_share_access); int oflag = nfs4_access_to_omode(open->op_share_access);
int access = nfs4_access_to_access(open->op_share_access); int access = nfs4_access_to_access(open->op_share_access);
/* CLAIM_DELEGATE_CUR is used in response to a broken lease;
* allowing it to break the lease and return EAGAIN leaves the
* client unable to make progress in returning the delegation */
if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR)
access |= NFSD_MAY_NOT_BREAK_LEASE;
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]);