diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-02-21 15:23:01 -0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-03-18 17:38:38 -0400 |
| commit | 18f82731b7784ba81ee9b1ed6a8179b577fa898b (patch) | |
| tree | ffb78832820057bedd98cd6e0cb6ef512bc77414 | |
| parent | 6150ef0dc7f734366d297e2eb5697ae458a1ea19 (diff) | |
| download | blackbird-op-linux-18f82731b7784ba81ee9b1ed6a8179b577fa898b.tar.gz blackbird-op-linux-18f82731b7784ba81ee9b1ed6a8179b577fa898b.zip | |
nfsd4: rename io_during_grace_disallowed
Use a slightly clearer, more concise name. Also removed unused
argument.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5957f7766bdc..89e575e7daea 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2019,7 +2019,7 @@ check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) * that are not able to provide mandatory locking. */ static inline int -io_during_grace_disallowed(struct inode *inode, int flags) +grace_disallows_io(struct inode *inode) { return locks_in_grace() && mandatory_lock(inode); } @@ -2063,7 +2063,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl if (filpp) *filpp = NULL; - if (io_during_grace_disallowed(ino, flags)) + if (grace_disallows_io(ino)) return nfserr_grace; if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) |
