From: John Keller <jpk@sgi.com>
Date: Tue, 23 Mar 2004 22:43:38 +0000 (+0000)
Subject: Merge fix for xfs_bmap verbose mode stripe alignment calculations.
X-Git-Tag: v2.7.0~122
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4595c940c2808b36bf2f6eec4114a7014c642008;p=thirdparty%2Fxfsprogs-dev.git

Merge fix for xfs_bmap verbose mode stripe alignment calculations.
---

diff --git a/io/bmap.c b/io/bmap.c
index 20e48ca6c..0eef45c87 100644
--- a/io/bmap.c
+++ b/io/bmap.c
@@ -299,8 +299,8 @@ bmap_f(
 		tot_w = MINTOT_WIDTH;
 		bbperag = (off64_t)fsgeo.agblocks *
 			  (off64_t)fsgeo.blocksize / BBSIZE;
-		sunit = fsgeo.sunit;
-		swidth = fsgeo.swidth;
+		sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE;
+		swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE;
 		flg = sunit;
 
 		/*
@@ -349,6 +349,10 @@ bmap_f(
 			if (map[i + 1].bmv_oflags & BMV_OF_PREALLOC) {
 				flg |= FLG_PRE;
 			}
+			/*
+			 * If striping enabled, determine if extent starts/ends
+			 * on a stripe unit boundary.
+			 */
 			if (sunit) {
 				if (map[i + 1].bmv_block  % sunit != 0) {
 					flg |= FLG_BSU;