Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Please login to access the resource
openSUSE:Leap:15.2
xfsprogs
xfsprogs-mkfs-use-geometry-generation-helper-fu...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xfsprogs-mkfs-use-geometry-generation-helper-functions.patch of Package xfsprogs
From ebc2e79841949c838d994235727a72e4de854be6 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" <darrick.wong@oracle.com> Date: Wed, 23 May 2018 16:30:48 -0500 Subject: [PATCH] mkfs: use geometry generation / helper functions Git-commit: ebc2e79841949c838d994235727a72e4de854be6 Patch-mainline: v4.17.0-rc1 References: bsc#1129859 Since libxfs now has a function to fill out the geometry structure and libfrog has a function to pretty-print the geometry, have mkfs use the two helpers instead of open-coding it. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com> --- libxfs/libxfs_api_defs.h | 1 + mkfs/xfs_mkfs.c | 54 +++++++++++++++--------------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h index d2ab02a..709632f 100644 --- a/libxfs/libxfs_api_defs.h +++ b/libxfs/libxfs_api_defs.h @@ -150,5 +150,6 @@ #define xfs_rmap_lookup_le_range libxfs_rmap_lookup_le_range #define xfs_refc_block libxfs_refc_block #define xfs_rmap_compare libxfs_rmap_compare +#define xfs_fs_geometry libxfs_fs_geometry #endif /* __LIBXFS_API_DEFS_H__ */ diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index f973b6b..c234b93 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -20,7 +20,7 @@ #include <ctype.h> #include "xfs_multidisk.h" #include "libxcmd.h" - +#include "fsgeom.h" #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) @@ -3172,40 +3172,6 @@ initialise_mount( mp->m_sectbb_log = sbp->sb_sectlog - BBSHIFT; } -static void -print_mkfs_cfg( - struct mkfs_params *cfg, - char *dfile, - char *logfile, - char *rtfile) -{ - struct sb_feat_args *fp = &cfg->sb_feat; - - printf(_( -"meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n" -" =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n" -" =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u, reflink=%u\n" -"data =%-22s bsize=%-6u blocks=%llu, imaxpct=%u\n" -" =%-22s sunit=%-6u swidth=%u blks\n" -"naming =version %-14u bsize=%-6u ascii-ci=%d ftype=%d\n" -"log =%-22s bsize=%-6d blocks=%lld, version=%d\n" -" =%-22s sectsz=%-5u sunit=%d blks, lazy-count=%d\n" -"realtime =%-22s extsz=%-6d blocks=%lld, rtextents=%lld\n"), - dfile, cfg->inodesize, (long long)cfg->agcount, - (long long)cfg->agsize, - "", cfg->sectorsize, fp->attr_version, fp->projid32bit, - "", fp->crcs_enabled, fp->finobt, fp->spinodes, fp->rmapbt, - fp->reflink, - "", cfg->blocksize, (long long)cfg->dblocks, cfg->imaxpct, - "", cfg->dsunit, cfg->dswidth, - fp->dir_version, cfg->dirblocksize, fp->nci, fp->dirftype, - logfile, cfg->blocksize, (long long)cfg->logblocks, - fp->log_version, - "", cfg->lsectorsize, cfg->lsunit, fp->lazy_sb_counters, - rtfile, (int)cfg->rtextblocks << cfg->blocklog, - (long long)cfg->rtblocks, (long long)cfg->rtextents); -} - /* * Format everything from the generated config into the superblock that * will be used to initialise the on-disk superblock. This is the in-memory @@ -3967,12 +3933,26 @@ main( */ calculate_log_size(&cfg, &cli, mp); + finish_superblock_setup(&cfg, mp, sbp); + + /* Print the intended geometry of the fs. */ if (!quiet || dry_run) { - print_mkfs_cfg(&cfg, dfile, logfile, rtfile); + 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); + } + + xfs_report_geom(&geo, dfile, logfile, rtfile); if (dry_run) exit(0); } - finish_superblock_setup(&cfg, mp, sbp); /* * we need the libxfs buffer cache from here on in. -- 2.16.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor