Commit 5e7fc436 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 7f8ada98

fs/nfsd/vfs.c

+6 −7
Original line number Diff line number Diff line
@@ -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)