libgfs2: Remove die from fix_device_geometry
PATCH 2/2 libgfs2: Remove die from fix_device_geometry
This patch removes the die call from fix_device_geometry and adds error reporting. All callers are updated to provide the same behaviour as before.
--- gfs2/edit/hexedit.c | 6 +++++- gfs2/edit/savemeta.c | 6 +++++- gfs2/fsck/rgrepair.c | 7 ++++++- gfs2/libgfs2/device_geometry.c | 10 ++++++---- gfs2/libgfs2/libgfs2.h | 2 +- gfs2/mkfs/main_grow.c | 7 ++++++- gfs2/mkfs/main_mkfs.c | 6 +++++- 7 files changed, 34 insertions(+), 10 deletions(-)
gfs2/edit/hexedit.c +5 -1
@@ -1752,7 +1752,11 @@ void read_superblock(int fd) } block =0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize);device_geometry (&sbd); -fix_device_geometry (&sbd); +if (fix_device_geometry (&sbd)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sbd.device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }if (gfs1) { sbd.sd_inptrs = (sbd.bsize -sizeof (struct gfs_indirect )) /sizeof (uint64_t );
gfs2/edit/savemeta.c +5 -1
@@ -477,7 +477,11 @@ void savemeta(char *out_fn, int saveoption)fprintf (stderr,"Geometery error\n" );exit (-1 ); } -fix_device_geometry (&sbd); +if (fix_device_geometry (&sbd)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sbd.device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }osi_list_init (&sbd.rglist);init_buf_list (&sbd, &sbd.buf_list,128 <<20 );init_buf_list (&sbd, &sbd.nvbuf_list,0xffffffff );
gfs2/fsck/rgrepair.c +6 -1
@@ -348,7 +348,12 @@ int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list,fprintf (stderr,_ ("Geometry error\n" ));exit (-1 ); } -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + } +/* Compute the default resource group layout as mkfs would have done */ compute_rgrp_layout (sdp, FALSE);build_rgrps (sdp, FALSE);/* FALSE = calc but don't write to disk. */
gfs2/libgfs2/device_geometry.c +6 -4
@@ -43,7 +43,7 @@ int device_geometry(struct gfs2_sbd *sdp)* */ -void fix_device_geometry (struct gfs2_sbd *sdp) +int fix_device_geometry (struct gfs2_sbd *sdp) {struct device *device = &sdp->device;unsigned int bbsize = sdp->bsize >>GFS2_BASIC_BLOCK_SHIFT ;
@@ -61,9 +61,10 @@ void fix_device_geometry(struct gfs2_sbd *sdp) start = device->start; length = device->length; -if (length <1 << (20 -GFS2_BASIC_BLOCK_SHIFT )) -die ("device is way too small (%" PRIu64" bytes)\n" , - length <<GFS2_BASIC_BLOCK_SHIFT ); +if (length <1 << (20 -GFS2_BASIC_BLOCK_SHIFT )) { + errno =ENOSPC ; +return -1 ; + } remainder = start % bbsize;if (remainder) {
@@ -85,4 +86,5 @@ void fix_device_geometry(struct gfs2_sbd *sdp) device->start, device->length, device->rgf_flags);printf ("\nDevice Size: %" PRIu64"\n" , sdp->device_size); } +return 0 ; }
gfs2/libgfs2/libgfs2.h +1 -1
@@ -398,7 +398,7 @@ extern void __bcommit(struct buf_list *bl, int line, const char *caller);/* device_geometry.c */ extern int device_geometry (struct gfs2_sbd *sdp); -extern void fix_device_geometry (struct gfs2_sbd *sdp); +extern int fix_device_geometry (struct gfs2_sbd *sdp);/* fs_bits.c */ #define BFITNOENT (0xFFFFFFFF)
gfs2/mkfs/main_grow.c +6 -1
@@ -299,7 +299,12 @@ main_grow(int argc, char *argv[])if (read_sb (sdp) <0 )die (_ ("gfs: Error reading superblock.\n" )); -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + } +if (mount_gfs2_meta (sdp)) {fprintf (stderr,_ ("Error mounting GFS2 metafs: %s\n" ),strerror (errno));
gfs2/mkfs/main_mkfs.c +5 -1
@@ -530,7 +530,11 @@ void main_mkfs(int argc, char *argv[]) } sdp->device.length = sdp->orig_fssize; } -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }/* Compute the resource group layouts */
Signature · 1 line
1.6.2.1
PATCH 2/2 libgfs2: Remove die from fix_device_geometry
Hi,
Quoted 53 lines · Andrew Price
This patch removes the die call from
fix_device_geometryand adds error reporting. All callers are updated to provide the same behaviour as before.Signed-off-by Andrew Price <[email protected]>--- gfs2/edit/hexedit.c | 6 +++++- gfs2/edit/savemeta.c | 6 +++++- gfs2/fsck/rgrepair.c | 7 ++++++- gfs2/libgfs2/device_geometry.c | 10 ++++++---- gfs2/libgfs2/libgfs2.h | 2 +- gfs2/mkfs/main_grow.c | 7 ++++++- gfs2/mkfs/main_mkfs.c | 6 +++++- 7 files changed, 34 insertions(+), 10 deletions(-)gfs2/edit/hexedit.c +5
-1@@ -1752,7 +1752,11 @@ void read_superblock(int fd) } block =0x10 * (GFS2_DEFAULT_BSIZE / sbd.bsize);device_geometry (&sbd); -fix_device_geometry (&sbd); +if (fix_device_geometry (&sbd)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sbd.device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }if (gfs1) { sbd.sd_inptrs = (sbd.bsize -sizeof (struct gfs_indirect )) /sizeof (uint64_t );gfs2/edit/savemeta.c +5
-1@@ -477,7 +477,11 @@ void savemeta(char *out_fn, int saveoption)fprintf (stderr,"Geometery error\n" );exit (-1 ); } -fix_device_geometry (&sbd); +if (fix_device_geometry (&sbd)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sbd.device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }osi_list_init (&sbd.rglist);init_buf_list (&sbd, &sbd.buf_list,128 <<20 );init_buf_list (&sbd, &sbd.nvbuf_list,0xffffffff );gfs2/fsck/rgrepair.c +0
-0
gfs2/fsck/rgrepair.c int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list, · line 356
Quoted 10 lines
gfs2/fsck/rgrepair.c +6
-1@@ -348,7 +348,12 @@ int gfs2_rindex_calculate(struct gfs2_sbd *sdp, osi_list_t *ret_list,fprintf (stderr,_ ("Geometry error\n" ));exit (-1 ); } -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + } +
This is missing the gettext markup around the string.
Quoted 54 lines
gfs2/fsck/rgrepair.c +0
-0/* Compute the default resource group layout as mkfs would have done */ compute_rgrp_layout (sdp, FALSE);build_rgrps (sdp, FALSE);/* FALSE = calc but don't write to disk. */ gfs2/libgfs2/device_geometry.c +6
-4@@ -43,7 +43,7 @@ int device_geometry(struct gfs2_sbd *sdp)* */ -void fix_device_geometry (struct gfs2_sbd *sdp) +int fix_device_geometry (struct gfs2_sbd *sdp) {struct device *device = &sdp->device;unsigned int bbsize = sdp->bsize >>GFS2_BASIC_BLOCK_SHIFT ;@@ -61,9 +61,10 @@ void fix_device_geometry(struct gfs2_sbd *sdp) start = device->start; length = device->length; -if (length <1 << (20 -GFS2_BASIC_BLOCK_SHIFT )) -die ("device is way too small (%" PRIu64" bytes)\n" , - length <<GFS2_BASIC_BLOCK_SHIFT ); +if (length <1 << (20 -GFS2_BASIC_BLOCK_SHIFT )) { + errno =ENOSPC ; +return -1 ; + } remainder = start % bbsize;if (remainder) {@@ -85,4 +86,5 @@ void fix_device_geometry(struct gfs2_sbd *sdp) device->start, device->length, device->rgf_flags);printf ("\nDevice Size: %" PRIu64"\n" , sdp->device_size); } +return 0 ; }gfs2/libgfs2/libgfs2.h +1
-1@@ -398,7 +398,7 @@ extern void __bcommit(struct buf_list *bl, int line, const char *caller);/* device_geometry.c */ extern int device_geometry (struct gfs2_sbd *sdp); -extern void fix_device_geometry (struct gfs2_sbd *sdp); +extern int fix_device_geometry (struct gfs2_sbd *sdp);/* fs_bits.c */ #define BFITNOENT (0xFFFFFFFF)gfs2/mkfs/main_grow.c +0
-0
gfs2/mkfs/main_grow.c main_grow(int argc, char *argv[]) · line 307
Quoted 10 lines
gfs2/mkfs/main_grow.c +6
-1@@ -299,7 +299,12 @@ main_grow(int argc, char *argv[])if (read_sb (sdp) <0 )die (_ ("gfs: Error reading superblock.\n" )); -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + } +
... and so is this
Quoted 10 lines
gfs2/mkfs/main_grow.c +0
-0if (mount_gfs2_meta (sdp)) {fprintf (stderr,_ ("Error mounting GFS2 metafs: %s\n" ),strerror (errno));gfs2/mkfs/main_mkfs.c +0
-0@@ -530,7 +530,11 @@ void main_mkfs(int argc, char *argv[]) } sdp->device.length = sdp->orig_fssize;
gfs2/mkfs/main_mkfs.c void main_mkfs(int argc, char *argv[]) · line 540
Quoted 10 lines
gfs2/mkfs/main_mkfs.c +5
-1} -fix_device_geometry (sdp); +if (fix_device_geometry (sdp)) { +fprintf (stderr,"Device is too small (%" PRIu64" bytes)\n" , + sdp->device.length <<GFS2_BASIC_BLOCK_SHIFT ); +exit (-1 ); + }/* Compute the resource group layouts */
and this.
Otherwise it looks good,
Steve.