From: Oleg Drokin Date: Thu, 25 Feb 2016 03:00:22 +0000 (-0500) Subject: staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it. X-Git-Tag: android-x86-7.1-r1~1876^2~494 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c3856dc11a27a32d466dff6c3dbf09e36c1cf57;p=android-x86%2Fkernel.git staging/lustre: MAY_NOT_BLOCK is always defined, don't check for it. Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c index bbe6ebf04420..ba65fc041ffd 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. */