[PATCH] knfsd: nfsd4: remove superfluous grace period checks
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:
Родитель
7fc90ec93a
Коммит
6e46d8a9cc
|
@ -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(!(dp = find_delegation_stateid(ino, stateid))) {
|
||||
dprintk("NFSD: delegation stateid not found\n");
|
||||
if (nfs4_in_grace())
|
||||
status = nfserr_grace;
|
||||
goto out;
|
||||
}
|
||||
stidp = &dp->dl_stateid;
|
||||
} else { /* open or lock stateid */
|
||||
if (!(stp = find_stateid(stateid, flags))) {
|
||||
dprintk("NFSD: open or lock stateid not found\n");
|
||||
if (nfs4_in_grace())
|
||||
status = nfserr_grace;
|
||||
goto out;
|
||||
}
|
||||
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp))
|
||||
|
|
Загрузка…
Ссылка в новой задаче