From 46081863b8005a873e6154e57445ebecae6f2e25 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sat, 21 Feb 2009 15:23:01 -0800 Subject: [PATCH] --- yaml --- r: 142159 b: refs/heads/master c: 18f82731b7784ba81ee9b1ed6a8179b577fa898b h: refs/heads/master i: 142157: 68739dcab3a159d81827682590954a4f9dc89b36 142155: 01ebf84b26ba4b73f1d8a89f30603651e1c0044f 142151: 06ac5a7d39f4811e11514be7d42abaddc21805fa 142143: d887655eaed3881faebb98f4b53735947857bc30 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f2e003e1fe3..1cd42dc0d2ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6150ef0dc7f734366d297e2eb5697ae458a1ea19 +refs/heads/master: 18f82731b7784ba81ee9b1ed6a8179b577fa898b diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 5957f7766bdc..89e575e7daea 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/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))