staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it.

Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it.
Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2c3856dc · Oleg Drokin · Greg Kroah-Hartman · 8e80aa29 · 2c3856dc
Commit 2c3856dc authored Feb 24, 2016 by Oleg Drokin Committed by Greg Kroah-Hartman Feb 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/staging/lustre/lustre/llite/file.c drivers/staging/lustre/lustre/llite/file.c +0 -2

No files found.
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -3071,10 +3071,8 @@ int ll_inode_permission(struct inode *inode, int mask)
 {
 	int rc = 0;

-#ifdef MAY_NOT_BLOCK
 	if (mask & MAY_NOT_BLOCK)
 		return -ECHILD;
-#endif

       /* as root inode are NOT getting validated in lookup operation,
 	* need to do it before permission check. */