[PATCH] inotify: fix oops fix

Cc: Robert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/inotify.c b/fs/inotify.c
index cdfff9067149cd8f20b5bef9928a583f51f8fef4..a8a714e481405f37c3886c1761dd078a9e1fef37 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -1032,7 +1032,7 @@ static int __init inotify_setup(void)
                panic("inotify: register_filesystem returned %d!\n", ret);
 
        inotify_mnt = kern_mount(&inotify_fs_type);
-       if (unlikely(PTR_ERR(inotify_mnt)))
+       if (IS_ERR(inotify_mnt))
                panic("inotify: kern_mount ret %ld!\n", PTR_ERR(inotify_mnt));
 
        inotify_max_queued_events = 16384;