growing filesystems in 5-current
Lukas Ertl
l.ertl at univie.ac.at
Thu Apr 17 02:49:02 PDT 2003
Hi!
(I've sent the following mail to -hackers, but haven't received a reply
yet, so I'm trying here - thanks.)
Since growfs currently is not able to grow filesystems on vinum volumes in
5-current, I started playing around with it and hacked to following patch.
On first look it seems to work, but there is still a problem I can't
explain.
Consider a simple vinum volume with a concat plex, containing a 32 MB
subdisk. I newfs this volume like that:
---8<---
# newfs -O2 /dev/vinum/mytest
/dev/vinum/mytest: 32.0MB (65536 sectors) block size 16384, fragment size
2048
using 4 cylinder groups of 8.02MB, 513 blks, 1088 inodes.
super-block backups (for fsck -b #) at:
160, 16576, 32992, 49408
---8<---
So far, so good. Then I attach another 32 MB subdisk to the plex and try
my hacked growfs on it and I get this:
---8<---
# growfs /dev/vinum/mytest
We strongly recommend you to make a backup before growing the Filesystem
Did you backup your data (Yes/No) ? Yes
new file systemsize is: 32768 frags
Warning: 16160 sector(s) cannot be allocated.
growfs: 56.1MB (114912 sectors) block size 16384, fragment size 2048
using 7 cylinder groups of 8.02MB, 513 blks, 1088 inodes.
super-block backups (for fsck -b #) at:
65824, 82240, 98656
---8<---
Why do I loose so many sectors there? Can you help me find the bug?
At first I suspected sblock.fs_fpg, since a debug printf after:
---8<---
if (sblock.fs_size % sblock.fs_fpg != 0 &&
sblock.fs_size % sblock.fs_fpg < cgdmin(&sblock, sblock.fs_ncg)) {
---8<---
said that sblock.fs_fpg is 0 - a debug printf before that if statement
told me a more likely number.
Apart from that: am I going the wrong way with this patch? Is there a
better way to fit growfs to the new vinum/geom stuff?
Here's the patch:
---8<---
Index: growfs.c
===================================================================
RCS file: /u/cvs/cvs/src/sbin/growfs/growfs.c,v
retrieving revision 1.13
diff -u -r1.13 growfs.c
--- growfs.c 30 Dec 2002 21:18:05 -0000 1.13
+++ growfs.c 16 Apr 2003 17:51:02 -0000
@@ -56,6 +56,7 @@
#include <sys/disklabel.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <sys/disk.h>
#include <stdio.h>
#include <paths.h>
@@ -111,6 +112,8 @@
static char inobuf[MAXBSIZE]; /* inode block */
static int maxino; /* last valid inode */
+static int unlabeled;
+
/*
* An array of elements of type struct gfs_bpp describes all blocks to
* be relocated in order to free the space needed for the cylinder group
@@ -148,6 +151,7 @@
static void updrefs(int, ino_t, struct gfs_bpp *, int, int, unsigned int);
static void indirchk(ufs_lbn_t, ufs_lbn_t, ufs2_daddr_t, ufs_lbn_t,
struct gfs_bpp *, int, int, unsigned int);
+static void get_dev_size(int, int *);
/* ************************************************************ growfs ***** */
/*
@@ -1884,6 +1888,21 @@
return columns;
}
+static void
+get_dev_size(int fd, int *size)
+{
+ int sectorsize;
+ off_t mediasize;
+
+ ioctl(fd, DIOCGSECTORSIZE, §orsize);
+ ioctl(fd, DIOCGMEDIASIZE, &mediasize);
+
+ if (sectorsize <= 0)
+ errx(1, "bogus sectorsize: %d", sectorsize);
+
+ *size = mediasize / sectorsize;
+}
+
/* ************************************************************** main ***** */
/*
* growfs(8) is a utility which allows to increase the size of an existing
@@ -1921,6 +1940,7 @@
struct disklabel *lp;
struct partition *pp;
int i,fsi,fso;
+ u_int32_t p_size;
char reply[5];
#ifdef FSMAXSNAP
int j;
@@ -2020,25 +2040,30 @@
*/
cp=device+strlen(device)-1;
lp = get_disklabel(fsi);
- if(lp->d_type == DTYPE_VINUM) {
- pp = &lp->d_partitions[0];
- } else if (isdigit(*cp)) {
- pp = &lp->d_partitions[2];
- } else if (*cp>='a' && *cp<='h') {
- pp = &lp->d_partitions[*cp - 'a'];
+ if (lp != NULL) {
+ if (isdigit(*cp)) {
+ pp = &lp->d_partitions[2];
+ } else if (*cp>='a' && *cp<='h') {
+ pp = &lp->d_partitions[*cp - 'a'];
+ } else {
+ errx(1, "unknown device");
+ }
+ p_size = pp->p_size;
} else {
- errx(1, "unknown device");
+ get_dev_size(fsi, &p_size);
}
/*
* Check if that partition looks suited for growing a file system.
*/
- if (pp->p_size < 1) {
+ if (p_size < 1) {
errx(1, "partition is unavailable");
}
+/*
if (pp->p_fstype != FS_BSDFFS) {
errx(1, "partition not 4.2BSD");
}
+*/
/*
* Read the current superblock, and take a backup.
@@ -2067,11 +2092,11 @@
* Determine size to grow to. Default to the full size specified in
* the disk label.
*/
- sblock.fs_size = dbtofsb(&osblock, pp->p_size);
+ sblock.fs_size = dbtofsb(&osblock, p_size);
if (size != 0) {
- if (size > pp->p_size){
+ if (size > p_size){
errx(1, "There is not enough space (%d < %d)",
- pp->p_size, size);
+ p_size, size);
}
sblock.fs_size = dbtofsb(&osblock, size);
}
@@ -2121,7 +2146,7 @@
* later on realize we have to abort our operation, on that block
* there should be no data, so we can't destroy something yet.
*/
- wtfs((ufs2_daddr_t)pp->p_size-1, (size_t)DEV_BSIZE, (void *)&sblock,
+ wtfs((ufs2_daddr_t)p_size-1, (size_t)DEV_BSIZE, (void *)&sblock,
fso, Nflag);
/*
@@ -2182,12 +2207,14 @@
/*
* Update the disk label.
*/
- pp->p_fsize = sblock.fs_fsize;
- pp->p_frag = sblock.fs_frag;
- pp->p_cpg = sblock.fs_fpg;
-
- return_disklabel(fso, lp, Nflag);
- DBG_PRINT0("label rewritten\n");
+ if (!unlabeled) {
+ pp->p_fsize = sblock.fs_fsize;
+ pp->p_frag = sblock.fs_frag;
+ pp->p_cpg = sblock.fs_fpg;
+
+ return_disklabel(fso, lp, Nflag);
+ DBG_PRINT0("label rewritten\n");
+ }
close(fsi);
if(fso>-1) close(fso);
@@ -2254,12 +2281,13 @@
if (!lab) {
errx(1, "malloc failed");
}
- if (ioctl(fd, DIOCGDINFO, (char *)lab) < 0) {
- errx(1, "DIOCGDINFO failed");
+ if (!ioctl(fd, DIOCGDINFO, (char *)lab)) {
+ return (lab);
}
+ unlabeled++;
DBG_LEAVE;
- return (lab);
+ return (NULL);
}
---8<---
best regards,
le
--
Lukas Ertl eMail: l.ertl at univie.ac.at
UNIX-Systemadministrator Tel.: (+43 1) 4277-14073
Zentraler Informatikdienst (ZID) Fax.: (+43 1) 4277-9140
der Universität Wien http://mailbox.univie.ac.at/~le/
More information about the freebsd-fs
mailing list