From ca4693ed4b769d9ea168b99924a24de6eb6dbbf1 Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Wed, 4 Jan 1995 23:49:51 +0000 Subject: [PATCH] Allow for the specification of bsize, fsize, and bps (blocks per segment) for LFS filesystems. --- sbin/bsdlabel/bsdlabel.c | 17 ++++++++++++++++- sbin/disklabel/disklabel.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 0914af290d50..efcbbf2f27ce 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -679,7 +679,7 @@ display(f, lp) fprintf(f, "%d ", lp->d_drivedata[j]); fprintf(f, "\n\n%d partitions:\n", lp->d_npartitions); fprintf(f, - "# size offset fstype [fsize bsize cpg]\n"); + "# size offset fstype [fsize bsize bps/cpg]\n"); pp = lp->d_partitions; for (i = 0; i < lp->d_npartitions; i++, pp++) { if (pp->p_size) { @@ -702,6 +702,12 @@ display(f, lp) pp->p_cpg); break; + case FS_BSDLFS: + fprintf(f, " %5d %5d %5d", + pp->p_fsize, pp->p_fsize * pp->p_frag, + pp->p_cpg); + break; + default: fprintf(f, "%20.20s", ""); break; @@ -1120,6 +1126,15 @@ getasciilabel(f, lp) NXTNUM(pp->p_cpg); break; + case FS_BSDLFS: + NXTNUM(pp->p_fsize); + if (pp->p_fsize == 0) + break; + NXTNUM(v); + pp->p_frag = v / pp->p_fsize; + NXTNUM(pp->p_cpg); + break; + default: break; } diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 0914af290d50..efcbbf2f27ce 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -679,7 +679,7 @@ display(f, lp) fprintf(f, "%d ", lp->d_drivedata[j]); fprintf(f, "\n\n%d partitions:\n", lp->d_npartitions); fprintf(f, - "# size offset fstype [fsize bsize cpg]\n"); + "# size offset fstype [fsize bsize bps/cpg]\n"); pp = lp->d_partitions; for (i = 0; i < lp->d_npartitions; i++, pp++) { if (pp->p_size) { @@ -702,6 +702,12 @@ display(f, lp) pp->p_cpg); break; + case FS_BSDLFS: + fprintf(f, " %5d %5d %5d", + pp->p_fsize, pp->p_fsize * pp->p_frag, + pp->p_cpg); + break; + default: fprintf(f, "%20.20s", ""); break; @@ -1120,6 +1126,15 @@ getasciilabel(f, lp) NXTNUM(pp->p_cpg); break; + case FS_BSDLFS: + NXTNUM(pp->p_fsize); + if (pp->p_fsize == 0) + break; + NXTNUM(v); + pp->p_frag = v / pp->p_fsize; + NXTNUM(pp->p_cpg); + break; + default: break; }