aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-02-21 18:23:01 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-03-18 17:38:38 -0400
commit18f82731b7784ba81ee9b1ed6a8179b577fa898b (patch)
treeffb78832820057bedd98cd6e0cb6ef512bc77414
parent6150ef0dc7f734366d297e2eb5697ae458a1ea19 (diff)
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.c4
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)
2019 * that are not able to provide mandatory locking. 2019 * that are not able to provide mandatory locking.
2020 */ 2020 */
2021static inline int 2021static inline int
2022io_during_grace_disallowed(struct inode *inode, int flags) 2022grace_disallows_io(struct inode *inode)
2023{ 2023{
2024 return locks_in_grace() && mandatory_lock(inode); 2024 return locks_in_grace() && mandatory_lock(inode);
2025} 2025}
@@ -2063,7 +2063,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
2063 if (filpp) 2063 if (filpp)
2064 *filpp = NULL; 2064 *filpp = NULL;
2065 2065
2066 if (io_during_grace_disallowed(ino, flags)) 2066 if (grace_disallows_io(ino))
2067 return nfserr_grace; 2067 return nfserr_grace;
2068 2068
2069 if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) 2069 if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))