2 files changed, 7 insertions, 8 deletions

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6f182d25793d..31673cd251c3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2035,7 +2035,7 @@ static inline int
 io_during_grace_disallowed(struct inode *inode, int flags)
 {
         return nfs4_in_grace() && (flags & (RD_STATE | WR_STATE))
-                && MANDATORY_LOCK(inode);
+                && mandatory_lock(inode);
 }
 
 /*
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index cec78c82b1f9..2a8d665b134b 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -61,12 +61,6 @@
 #define NFSDDBG_FACILITY                NFSDDBG_FILEOP
 
 
-/* We must ignore files (but only files) which might have mandatory
- * locks on them because there is no way to know if the accesser has
- * the lock.
- */
-#define IS_ISMNDLK(i)   (S_ISREG((i)->i_mode) && MANDATORY_LOCK(i))
-
 /*
  * This is a cache of readahead params that help us choose the proper
  * readahead strategy. Initially, we set all readahead parameters to 0
@@ -689,7 +683,12 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type,
         err = nfserr_perm;
         if (IS_APPEND(inode) && (access & MAY_WRITE))
                 goto out;
-        if (IS_ISMNDLK(inode))
+        /*
+         * We must ignore files (but only files) which might have mandatory
+         * locks on them because there is no way to know if the accesser has
+         * the lock.
+         */
+        if (S_ISREG((inode)->i_mode) && mandatory_lock(inode))
                 goto out;
 
         if (!inode->i_fop)