diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-06-30 01:56:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 11:25:40 -0700 |
| commit | 6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73 (patch) | |
| tree | fd5706307c249d7be444a2e4b21ac256203d1e56 /fs | |
| parent | 7fc90ec93a5eb71f4b08403baf5ba7176b3ec6b1 (diff) | |
| download | kernel-common-6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73.tar.gz kernel-common-6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73.tar.bz2 kernel-common-6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73.zip | |
[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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 21497321a525..4810577347cf 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -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)) |