summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Rosenberg <drosen@google.com>2016-03-23 12:09:25 -0700
committerDaniel Rosenberg <drosen@google.com>2016-03-23 20:46:32 +0000
commitd1317d3536f0cfb83004d1bccaf002c7fda617be (patch)
treec32b28394d52c5cc768e7585a25397eb3687e01c
parent483c0cc57aa888b2c81d11eb72a47135da7c36f4 (diff)
downloadtegra-d1317d3536f0cfb83004d1bccaf002c7fda617be.tar.gz
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
-rw-r--r--fs/notify/inotify/inotify_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index a61bcb73c45e..a9d3e30f06c5 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -849,7 +849,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);
event_priv_cachep = KMEM_CACHE(inotify_event_private_data, SLAB_PANIC);