From: Daniel Rosenberg <drosen@google.com>
Date: Wed, 23 Mar 2016 19:09:25 +0000 (-0700)
Subject: inotify: Fix erroneous update of bit count
X-Git-Tag: firefly_0821_release~176^2~427
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ce15174caf1ce927a9255b23438977411082d20d;p=firefly-linux-kernel-4.4.55.git

inotify: Fix erroneous update of bit count

Patch "vfs: add d_canonical_path for stacked filesystem support"
erroneously updated the ALL_INOTIFY_BITS count. This changes it back

Change-Id: Idb04edc736da276159d30f04c40cff9d6b1e070f
---

diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 9a0cd02cf3dc..f72f3b25b3f2 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -825,7 +825,7 @@ static int __init inotify_user_setup(void)
 	BUILD_BUG_ON(IN_ISDIR != FS_ISDIR);
 	BUILD_BUG_ON(IN_ONESHOT != FS_IN_ONESHOT);
 
-	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 22);
+	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 21);
 
 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark, SLAB_PANIC);