From 703f999a1efcec0632dfcbffeb3a994ff2239b4e Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 13 Jan 2011 15:46:18 -0800
Subject: [PATCH] --- yaml --- r: 230733 b: refs/heads/master c:
 c585a2678d83ba8fb02fa6b197de0ac7d67377f1 h: refs/heads/master i:   230731:
 15e2ea83e09d4a6fcfb30e34b1545d594be8902d v: v3

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

diff --git a/[refs] b/[refs]
index 6c12257bd521..629af0c72830 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e20e87795834f2f14cb53baf657b91d9c39f92c8
+refs/heads/master: c585a2678d83ba8fb02fa6b197de0ac7d67377f1
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index b4ad8e36c81a..83a45d35468b 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -2227,7 +2227,7 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping,
 		gfp_notmask = __GFP_FS;
 repeat:
 	page = find_lock_page(mapping, index);
-	if (likely(page))
+	if (page)
 		return page;
 
 	page = __page_cache_alloc(mapping_gfp_mask(mapping) & ~gfp_notmask);