From 7fa28393ca2cb52142d6fe0e0ab206f77d3f1c4a Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 7 Aug 2012 13:47:12 +0100
Subject: [PATCH] --- yaml --- r: 323269 b: refs/heads/master c:
 5d50d5324612d28c47b9361e5424f13a19c888cd h: refs/heads/master i:   323267:
 b0e299f76338f6ccb4b37d773eaba53c6dff22f5 v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/rgrp.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7bb448c966a0..ba41ad30e61b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d634e8f3b43fe2eb7c7d66567de7aba8edc308
+refs/heads/master: 5d50d5324612d28c47b9361e5424f13a19c888cd
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 7ce22d8c489b..c17029a92b8f 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -1596,6 +1596,12 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state,
 			n += (rbm->bi - initial_bi);
 			goto find_next;
 		}
+		if (ret == -E2BIG) {
+			index = 0;
+			rbm->offset = 0;
+			n += (rbm->bi - initial_bi);
+			goto res_covered_end_of_rgrp;
+		}
 		return ret;
 
 bitmap_full:	/* Mark bitmap as full and fall through */
@@ -1608,6 +1614,7 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state,
 		index++;
 		if (index == rbm->rgd->rd_length)
 			index = 0;
+res_covered_end_of_rgrp:
 		rbm->bi = &rbm->rgd->rd_bits[index];
 		if ((index == 0) && nowrap)
 			break;