Skip to contentSkip to conversation

xfs_growfs: don't grow data if only -m is specified

PATCH In review Eric Sandeen 2 participants 2 messages Feb 27, 2014 – Feb 28, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs_growfs: don't grow data if only -m is specified

While writing an xfstest to check imaxpct behavior, I realized that xfs_growfs -m XXX /mnt/point will not only change imaxpct, but also grow the filesystem if it's not currently occupying the entire block device. This doesn't seem like the expected behavior, so split it out such that if only -m, and not -d, is specified, only the imaxpct will be changed.

This is a change from previous behavior, but I think it satisfies the principle of least surprise...

---

growfs/xfs_growfs.c +6 -3
index 2df68fb..fb7eda8 100644
@@ -189,7 +189,7 @@ main(int argc, char **argv)
 		usage();
 	if (iflag && xflag)
 		usage();
-	if (dflag + lflag + rflag == 0)
+	if (dflag + lflag + rflag + mflag == 0)
 		aflag = 1;
 
 	fs_table_initialise(0, NULL, 0, NULL);
@@ -305,12 +305,15 @@ main(int argc, char **argv)
 	drsize -= (drsize % 2);
 
 	error = 0;
-	if (dflag | aflag) {
+
+	if (dflag | mflag | aflag) {
 		xfs_growfs_data_t	in;
 
 		if (!mflag)
 			maxpct = geo.imaxpct;
-		if (!dsize)
+		if (!dflag && !aflag)	/* Only mflag, no data size change */
+			dsize = geo.datablocks;
+		else if (!dsize)
 			dsize = ddsize / (geo.blocksize / BBSIZE);
 		else if (dsize > ddsize / (geo.blocksize / BBSIZE)) {
 			fprintf(stderr, _(

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Eric Sandeen

While writing an xfstest to check imaxpct behavior, I realized that xfs_growfs -m XXX /mnt/point will not only change imaxpct, but also grow the filesystem if it's not currently occupying the entire block device. This doesn't seem like the expected behavior, so split it out such that if only -m, and not -d, is specified, only the imaxpct will be changed.

This is a change from previous behavior, but I think it satisfies the principle of least surprise...

Seems reasonable to me. Code looks good, too.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs