diff options
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 2 | ||||
-rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 3f559700788..3c028b9c6e0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -2044,7 +2044,7 @@ static inline int | |||
2044 | io_during_grace_disallowed(struct inode *inode, int flags) | 2044 | io_during_grace_disallowed(struct inode *inode, int flags) |
2045 | { | 2045 | { |
2046 | return nfs4_in_grace() && (flags & (RD_STATE | WR_STATE)) | 2046 | return nfs4_in_grace() && (flags & (RD_STATE | WR_STATE)) |
2047 | && MANDATORY_LOCK(inode); | 2047 | && mandatory_lock(inode); |
2048 | } | 2048 | } |
2049 | 2049 | ||
2050 | /* | 2050 | /* |
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 7867151ebb8..9152f87eea1 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -65,7 +65,7 @@ | |||
65 | * locks on them because there is no way to know if the accesser has | 65 | * locks on them because there is no way to know if the accesser has |
66 | * the lock. | 66 | * the lock. |
67 | */ | 67 | */ |
68 | #define IS_ISMNDLK(i) (S_ISREG((i)->i_mode) && MANDATORY_LOCK(i)) | 68 | #define IS_ISMNDLK(i) (S_ISREG((i)->i_mode) && mandatory_lock(i)) |
69 | 69 | ||
70 | /* | 70 | /* |
71 | * This is a cache of readahead params that help us choose the proper | 71 | * This is a cache of readahead params that help us choose the proper |