GFS2: Stop looking for free blocks at end of rgrp

PATCH New Bob Peterson 1 participant 1 message Dec 20, 2012 1 message not in the archive GFS2 file system

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Bob Peterson

author

2012-12-20 18:21 UTC #1 lore raw

PATCH 1/1 GFS2: Stop looking for free blocks at end of rgrp

Hi,

This patch adds a return code check after calling function gfs2_rbm_from_block while determining the free extent size. That way, when the end of an rgrp is reached, it won't try to process unaligned blocks after the end.

Regards,

Bob Peterson
Red Hat File Systems

Signed-off-by Bob Peterson <[email protected]>

---
 fs/gfs2/rgrp.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

fs/gfs2/rgrp.c +7 -3

index 37ee061..db2c423 100644
@@ -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;
 	}