From: Eric Sandeen Date: Wed, 24 Jul 2019 19:54:07 +0000 (-0400) Subject: xfs: change some error-less functions to void types X-Git-Tag: v5.2.0-rc0~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a37cde53f8e513672228ad68d594294cbe365aab;p=thirdparty%2Fxfsprogs-dev.git xfs: change some error-less functions to void types Source kernel commit: 910832697cf85536c7fe26edb8bc6f830c4b9bb6 There are several functions which have no opportunity to return an error, and don't contain any ASSERTs which could be argued to be better constructed as error cases. So, make them voids to simplify the callers. Signed-off-by: Eric Sandeen Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Reviewed-by: Dave Chinner Signed-off-by: Eric Sandeen --- diff --git a/db/info.c b/db/info.c index b6c78f5c0..7dae6e255 100644 --- a/db/info.c +++ b/db/info.c @@ -27,16 +27,8 @@ info_f( char **argv) { struct xfs_fsop_geom geo; - int error; - - error = -libxfs_fs_geometry(&mp->m_sb, &geo, - XFS_FS_GEOM_MAX_STRUCT_VER); - if (error) { - dbprintf(_("could not obtain geometry\n")); - exitcode = 1; - return 0; - } + libxfs_fs_geometry(&mp->m_sb, &geo, XFS_FS_GEOM_MAX_STRUCT_VER); xfs_report_geom(&geo, fsdevice, x.logname, x.rtname); return 0; } diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c index 8bcae1690..3a4eaca2a 100644 --- a/libxfs/xfs_dquot_buf.c +++ b/libxfs/xfs_dquot_buf.c @@ -108,7 +108,7 @@ xfs_dqblk_verify( /* * Do some primitive error checking on ondisk dquot data structures. */ -int +void xfs_dqblk_repair( struct xfs_mount *mp, struct xfs_dqblk *dqb, @@ -131,8 +131,6 @@ xfs_dqblk_repair( xfs_update_cksum((char *)dqb, sizeof(struct xfs_dqblk), XFS_DQUOT_CRC_OFF); } - - return 0; } STATIC bool diff --git a/libxfs/xfs_quota_defs.h b/libxfs/xfs_quota_defs.h index d3f29779b..c136ce0b0 100644 --- a/libxfs/xfs_quota_defs.h +++ b/libxfs/xfs_quota_defs.h @@ -144,7 +144,7 @@ extern xfs_failaddr_t xfs_dquot_verify(struct xfs_mount *mp, extern xfs_failaddr_t xfs_dqblk_verify(struct xfs_mount *mp, struct xfs_dqblk *dqb, xfs_dqid_t id, uint type); extern int xfs_calc_dquots_per_chunk(unsigned int nbblks); -extern int xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb, +extern void xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb, xfs_dqid_t id, uint type); #endif /* __XFS_QUOTA_H__ */ diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c index 630250166..7ca423ea6 100644 --- a/libxfs/xfs_sb.c +++ b/libxfs/xfs_sb.c @@ -1062,7 +1062,7 @@ out: return error; } -int +void xfs_fs_geometry( struct xfs_sb *sbp, struct xfs_fsop_geom *geo, @@ -1086,13 +1086,13 @@ xfs_fs_geometry( memcpy(geo->uuid, &sbp->sb_uuid, sizeof(sbp->sb_uuid)); if (struct_version < 2) - return 0; + return; geo->sunit = sbp->sb_unit; geo->swidth = sbp->sb_width; if (struct_version < 3) - return 0; + return; geo->version = XFS_FSOP_GEOM_VERSION; geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK | @@ -1136,7 +1136,7 @@ xfs_fs_geometry( geo->dirblocksize = xfs_dir2_dirblock_bytes(sbp); if (struct_version < 4) - return 0; + return; if (xfs_sb_version_haslogv2(sbp)) geo->flags |= XFS_FSOP_GEOM_FLAGS_LOGV2; @@ -1144,11 +1144,9 @@ xfs_fs_geometry( geo->logsunit = sbp->sb_logsunit; if (struct_version < 5) - return 0; + return; geo->version = XFS_FSOP_GEOM_VERSION_V5; - - return 0; } /* Read a secondary superblock. */ diff --git a/libxfs/xfs_sb.h b/libxfs/xfs_sb.h index 13564d698..92465a9a5 100644 --- a/libxfs/xfs_sb.h +++ b/libxfs/xfs_sb.h @@ -33,7 +33,7 @@ extern void xfs_sb_quota_from_disk(struct xfs_sb *sbp); extern int xfs_update_secondary_sbs(struct xfs_mount *mp); #define XFS_FS_GEOM_MAX_STRUCT_VER (4) -extern int xfs_fs_geometry(struct xfs_sb *sbp, struct xfs_fsop_geom *geo, +extern void xfs_fs_geometry(struct xfs_sb *sbp, struct xfs_fsop_geom *geo, int struct_version); extern int xfs_sb_read_secondary(struct xfs_mount *mp, struct xfs_trans *tp, xfs_agnumber_t agno, diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index 65cf1e0f6..0adaa65d1 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -4052,17 +4052,8 @@ main( /* Print the intended geometry of the fs. */ if (!quiet || dry_run) { struct xfs_fsop_geom geo; - int error; - - error = -libxfs_fs_geometry(sbp, &geo, - XFS_FS_GEOM_MAX_STRUCT_VER); - if (error) { - fprintf(stderr, - _("%s: failed to generate filesystem geometry\n"), - progname); - exit(1); - } + libxfs_fs_geometry(sbp, &geo, XFS_FS_GEOM_MAX_STRUCT_VER); xfs_report_geom(&geo, dfile, logfile, rtfile); if (dry_run) exit(0);