From: Andrew Morton <akpm@osdl.org>
Date: Tue, 26 Jul 2005 21:08:38 +0000 (-0700)
Subject: [PATCH] inotify: fix oops fix
X-Git-Tag: v2.6.13-rc4~66
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89373de7dd010832d8b68cb37dabb33ff5a688bb;p=linux-2.6

[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 cdfff90671..a8a714e481 100644
--- 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;