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 | |
| parent | 7f8ada98d9edd83d6ebd01e431e15b024a4a3dc4 (diff) | |
| download | linux-5e7fc436426b1f9e106f511a049de91c82ec2c53.tar.gz linux-5e7fc436426b1f9e106f511a049de91c82ec2c53.tar.bz2 linux-5e7fc436426b1f9e106f511a049de91c82ec2c53.zip | |
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')
| -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 9152f87eea18..085ded6f6d3a 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 @@ -680,7 +674,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) |