Skip to content

Commit 982dfdf

Browse files
jtlaytongregkh
authored andcommitted
nfsd: remove unneeded EEXIST error check in nfsd_do_file_acquire
[ Upstream commit 81a95c2 ] Given that we do the search and insertion while holding the i_lock, I don't think it's possible for us to get EEXIST here. Remove this case. Fixes: c659336 ("nfsd: don't kill nfsd_files because of lease break error") Signed-off-by: Jeff Layton <[email protected]> Tested-by: Youzhong Yang <[email protected]> Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 6ba2624 commit 982dfdf

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

fs/nfsd/filecache.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,8 +1040,6 @@ nfsd_file_do_acquire(struct svc_rqst *rqstp, struct svc_fh *fhp,
10401040
if (likely(ret == 0))
10411041
goto open_file;
10421042

1043-
if (ret == -EEXIST)
1044-
goto retry;
10451043
trace_nfsd_file_insert_err(rqstp, inode, may_flags, ret);
10461044
status = nfserr_jukebox;
10471045
goto construction_err;

0 commit comments

Comments
 (0)