ANDROID: 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

(cherry picked from commit d68fa6395341b0bbe4064745d52cc06c5e3316ba)

BUG=b:27790437
TEST=Build and boot on Smaug.

Change-Id: I1c747f81d2c0beeee45199ed052fc27aea998c3f
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/335186
Reviewed-by: Daniel Rosenberg <drosen@google.com>
(cherry picked from commit 05cbe99ca7ab0e887089f2793fbfcf93660576b9)
Reviewed-on: https://chromium-review.googlesource.com/336846

fs/notify/inotify/inotify_user.c

@@ -814,7 +814,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);