From: J. Bruce Fields 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 Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/nfsd/nfs4state.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN fs/nfsd/nfs4state.c~knfsd-nfsd4-remove-superfluous-grace-period-checks fs/nfsd/nfs4state.c --- a/fs/nfsd/nfs4state.c~knfsd-nfsd4-remove-superfluous-grace-period-checks +++ a/fs/nfsd/nfs4state.c @@ -2070,16 +2070,12 @@ nfs4_preprocess_stateid_op(struct svc_fh 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)) _