From b393f6a1b609cb5d948cf6ff70ba3b2a67009db4 Mon Sep 17 00:00:00 2001
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Date: Sat, 12 Jan 2013 01:34:50 -0800
Subject: [PATCH] --- yaml --- r: 359015 b: refs/heads/master c:
 2b0542a4a0d9b8cb98e64fc87c5e31d130029a92 h: refs/heads/master i:   359013:
 c45c58ab99df0caacaa032470c68626aad562ed9   359011:
 6eaf2e9b4d912bd84736a61b8b3c6a38a3e364f2   359007:
 7c6044d929617bb0698e3f7c556c39c3cab1fb22 v: v3

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

diff --git a/[refs] b/[refs]
index bde6937a012d..ab1d21350fed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61f43e6880dee5983999fe40bf96c1cf43740b4c
+refs/heads/master: 2b0542a4a0d9b8cb98e64fc87c5e31d130029a92
diff --git a/trunk/fs/ext2/super.c b/trunk/fs/ext2/super.c
index fa04d023177e..7f68c8114026 100644
--- a/trunk/fs/ext2/super.c
+++ b/trunk/fs/ext2/super.c
@@ -1500,7 +1500,7 @@ static ssize_t ext2_quota_write(struct super_block *sb, int type,
 			bh = sb_bread(sb, tmp_bh.b_blocknr);
 		else
 			bh = sb_getblk(sb, tmp_bh.b_blocknr);
-		if (!bh) {
+		if (unlikely(!bh)) {
 			err = -EIO;
 			goto out;
 		}
diff --git a/trunk/fs/ext2/xattr.c b/trunk/fs/ext2/xattr.c
index b6754dbbce3c..06209ec46152 100644
--- a/trunk/fs/ext2/xattr.c
+++ b/trunk/fs/ext2/xattr.c
@@ -662,7 +662,7 @@ ext2_xattr_set2(struct inode *inode, struct buffer_head *old_bh,
 			ea_idebug(inode, "creating block %d", block);
 
 			new_bh = sb_getblk(sb, block);
-			if (!new_bh) {
+			if (unlikely(!new_bh)) {
 				ext2_free_blocks(inode, block, 1);
 				mark_inode_dirty(inode);
 				error = -EIO;