Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] knfsd: nfsd4: remove superfluous grace period checks

Browse Source 
We're checking nfs_in_grace here a few times when there isn't really any
reason to--bad_stateid is probably the more sensible return value anyway.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
J. Bruce Fields 2006-06-30 01:56:14 -07:00 committed by Linus Torvalds
parent 7fc90ec93a
commit 6e46d8a9cc
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfsd/nfs4state.c
View File

@ -2070,16 +2070,12 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
if (!stateid->si_fileid) { /* delegation stateid */ if (!stateid->si_fileid) { /* delegation stateid */
if(!(dp = find_delegation_stateid(ino, stateid))) { if(!(dp = find_delegation_stateid(ino, stateid))) {
dprintk("NFSD: delegation stateid not found\n"); dprintk("NFSD: delegation stateid not found\n");
if (nfs4_in_grace())
status = nfserr_grace;
goto out; goto out;
} }
stidp = &dp->dl_stateid; stidp = &dp->dl_stateid;
} else { /* open or lock stateid */ } else { /* open or lock stateid */
if (!(stp = find_stateid(stateid, flags))) { if (!(stp = find_stateid(stateid, flags))) {
dprintk("NFSD: open or lock stateid not found\n"); dprintk("NFSD: open or lock stateid not found\n");
if (nfs4_in_grace())
status = nfserr_grace;
goto out; goto out;
} }
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp))