[PATCH 39/56] staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it.

From: green
Date: Mon Feb 22 2016 - 23:01:28 EST


From: Oleg Drokin <green@xxxxxxxxxxxxxx>

Signed-off-by: Oleg Drokin <green@xxxxxxxxxxxxxx>
---
drivers/staging/lustre/lustre/llite/file.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
index bbe6ebf..ba65fc0 100644
--- 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. */
--
2.1.0