diff options
author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-02 14:18:12 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2007-10-09 18:32:46 -0400 |
commit | 5e7fc436426b1f9e106f511a049de91c82ec2c53 (patch) | |
tree | e81390d24654d62a49091db2ba8084c08b61e9e3 /fs/nfsd/vfs.c | |
parent | 7f8ada98d9edd83d6ebd01e431e15b024a4a3dc4 (diff) |
nfsd: remove IS_ISMNDLCK macro
This macro is only used in one place; in this place it seems simpler to
put open-code it and move the comment to where it's used.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 9152f87eea1..085ded6f6d3 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -61,12 +61,6 @@ | |||
61 | #define NFSDDBG_FACILITY NFSDDBG_FILEOP | 61 | #define NFSDDBG_FACILITY NFSDDBG_FILEOP |
62 | 62 | ||
63 | 63 | ||
64 | /* We must ignore files (but only files) which might have mandatory | ||
65 | * locks on them because there is no way to know if the accesser has | ||
66 | * the lock. | ||
67 | */ | ||
68 | #define IS_ISMNDLK(i) (S_ISREG((i)->i_mode) && mandatory_lock(i)) | ||
69 | |||
70 | /* | 64 | /* |
71 | * This is a cache of readahead params that help us choose the proper | 65 | * This is a cache of readahead params that help us choose the proper |
72 | * readahead strategy. Initially, we set all readahead parameters to 0 | 66 | * readahead strategy. Initially, we set all readahead parameters to 0 |
@@ -680,7 +674,12 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, int type, | |||
680 | err = nfserr_perm; | 674 | err = nfserr_perm; |
681 | if (IS_APPEND(inode) && (access & MAY_WRITE)) | 675 | if (IS_APPEND(inode) && (access & MAY_WRITE)) |
682 | goto out; | 676 | goto out; |
683 | if (IS_ISMNDLK(inode)) | 677 | /* |
678 | * We must ignore files (but only files) which might have mandatory | ||
679 | * locks on them because there is no way to know if the accesser has | ||
680 | * the lock. | ||
681 | */ | ||
682 | if (S_ISREG((inode)->i_mode) && mandatory_lock(inode)) | ||
684 | goto out; | 683 | goto out; |
685 | 684 | ||
686 | if (!inode->i_fop) | 685 | if (!inode->i_fop) |