From 655860a399dddf04d7cc0b8acb6438560f591143 Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Tue, 28 Aug 2012 08:45:56 -0400
Subject: [PATCH] --- yaml --- r: 323283 b: refs/heads/master c:
 0688a5ecea61a36ba12d17a18ab9f8712145cfa2 h: refs/heads/master i:   323281:
 162432ae3ce299224ccb4a731bbeb70f99be676b   323279:
 3250c4faaf63bf81397773190bd22a2927f077f3 v: v3

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

diff --git a/[refs] b/[refs]
index e81eff689538..bc33d64c6d11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c743ffd09fa7d3464c6f74767a3ae2ca5dc3ebf7
+refs/heads/master: 0688a5ecea61a36ba12d17a18ab9f8712145cfa2
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 886954126704..defb8265ce52 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -1834,8 +1834,7 @@ static void gfs2_alloc_extent(const struct gfs2_rbm *rbm, bool dinode,
 	block++;
 	while (*n < elen) {
 		ret = gfs2_rbm_from_block(&pos, block);
-		WARN_ON(ret);
-		if (gfs2_testbit(&pos) != GFS2_BLKST_FREE)
+		if (ret || gfs2_testbit(&pos) != GFS2_BLKST_FREE)
 			break;
 		gfs2_trans_add_bh(pos.rgd->rd_gl, pos.bi->bi_bh, 1);
 		gfs2_setbit(&pos, true, GFS2_BLKST_USED);