From 48effe1d833deb64cd6b412da5e9675c3dd0e421 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sat, 3 Nov 2012 21:30:21 +0100
Subject: [PATCH] --- yaml --- r: 345682 b: refs/heads/master c:
 4789775477718983b6f8c604a809b950c6a10052 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9e54a3a72d01..299c6de0ff8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 195c0f96f0f96da317e22c9851a7ecc1a541f9ad
+refs/heads/master: 4789775477718983b6f8c604a809b950c6a10052
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index 7e87e37a372a..b176d4253544 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -1071,8 +1071,7 @@ struct buffer_head *ext3_getblk(handle_t *handle, struct inode *inode,
 	 * mapped. 0 in case of a HOLE.
 	 */
 	if (err > 0) {
-		if (err > 1)
-			WARN_ON(1);
+		WARN_ON(err > 1);
 		err = 0;
 	}
 	*errp = err;