diff --git a/[refs] b/[refs] index dc4337be73f4..06a5774d324e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b2ccf0cc15af717263c7cfe5d0aaf5ac057489e +refs/heads/master: e5ca844a9d795e97c08bc7901c62a48c28469eb0 diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c index 6a0ba2c858e6..cdfff9067149 100644 --- a/trunk/fs/inotify.c +++ b/trunk/fs/inotify.c @@ -1025,8 +1025,15 @@ static struct file_system_type inotify_fs_type = { */ static int __init inotify_setup(void) { - register_filesystem(&inotify_fs_type); + int ret; + + ret = register_filesystem(&inotify_fs_type); + if (unlikely(ret)) + panic("inotify: register_filesystem returned %d!\n", ret); + inotify_mnt = kern_mount(&inotify_fs_type); + if (unlikely(PTR_ERR(inotify_mnt))) + panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt)); inotify_max_queued_events = 16384; inotify_max_user_instances = 128;