---

yaml --- r: 359015 b: refs/heads/master c: 2b0542a h: refs/heads/master i: 359013: c45c58a 359011: 6eaf2e9 359007: 7c6044d v: v3
git-mirror · Jan 21, 2013 · b393f6a · b393f6a
1 parent d985892
commit b393f6a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;