From bfead34a508b62a30117cb64b7b0db71befc8926 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Tue, 26 Jul 2005 14:08:38 -0700
Subject: [PATCH] --- yaml --- r: 5036 b: refs/heads/master c:
 89373de7dd010832d8b68cb37dabb33ff5a688bb h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/fs/inotify.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d44b08430928..638b5165732a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 725b38ab5401c73cedc1b1d913782fadcd0f624a
+refs/heads/master: 89373de7dd010832d8b68cb37dabb33ff5a688bb
diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c
index cdfff9067149..a8a714e48140 100644
--- a/trunk/fs/inotify.c
+++ b/trunk/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;