Commit 18f82731 authored by J. Bruce Fields's avatar J. Bruce Fields

nfsd4: rename io_during_grace_disallowed

Use a slightly clearer, more concise name.  Also removed unused
argument.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 6150ef0d
...@@ -2019,7 +2019,7 @@ check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags) ...@@ -2019,7 +2019,7 @@ check_special_stateids(svc_fh *current_fh, stateid_t *stateid, int flags)
* that are not able to provide mandatory locking. * that are not able to provide mandatory locking.
*/ */
static inline int 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); 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 ...@@ -2063,7 +2063,7 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
if (filpp) if (filpp)
*filpp = NULL; *filpp = NULL;
if (io_during_grace_disallowed(ino, flags)) if (grace_disallows_io(ino))
return nfserr_grace; return nfserr_grace;
if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) if (ZERO_STATEID(stateid) || ONE_STATEID(stateid))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment