From 27fcdb5ebbbba2cd4ff9277e591feae5457b696e Mon Sep 17 00:00:00 2001
From: Bob Peterson <rpeterso@redhat.com>
Date: Thu, 20 Dec 2012 13:21:07 -0500
Subject: [PATCH] --- yaml --- r: 348143 b: refs/heads/master c:
 15bd50ad82a6d3421af1abe82e2554898abc4141 h: refs/heads/master i:   348141:
 c5e9531dafe4c5e27077d0a7756e244150726a99   348139:
 3a990e8395d7a0d824f8961a63fd7e38cb1b4fd0   348135:
 dd1af28f6a20e9fec6d7afaf1da6faf91d3781fc   348127:
 7a332d1c9d4709f6ef8f43c0280a4a3d4521a3f3 v: v3

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

diff --git a/[refs] b/[refs]
index c9545d59857c..ca2a697ba8d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1213cacc7ffc7d4cdef3692f22b28a2df3216f5
+refs/heads/master: 15bd50ad82a6d3421af1abe82e2554898abc4141
diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c
index 738b3888adc6..712dd4fd8641 100644
--- a/trunk/fs/gfs2/rgrp.c
+++ b/trunk/fs/gfs2/rgrp.c
@@ -350,10 +350,14 @@ static u32 gfs2_free_extlen(const struct gfs2_rbm *rrbm, u32 len)
 		BUG_ON(len < chunk_size);
 		len -= chunk_size;
 		block = gfs2_rbm_to_block(&rbm);
-		gfs2_rbm_from_block(&rbm, block + chunk_size);
-		n_unaligned = 3;
-		if (ptr)
+		if (gfs2_rbm_from_block(&rbm, block + chunk_size)) {
+			n_unaligned = 0;
 			break;
+		}
+		if (ptr) {
+			n_unaligned = 3;
+			break;
+		}
 		n_unaligned = len & 3;
 	}