mkfs: make inobtcount visible
PATCH 1/1 mkfs: make inobtcount visible
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
--- libfrog/fsgeom.c | 6 ++++-- libxfs/xfs_fs.h | 1 + libxfs/xfs_sb.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
libfrog/fsgeom.c +4 -2
@@ -29,6 +29,7 @@ xfs_report_geom(int rmapbt_enabled;int reflink_enabled;int bigtime_enabled; +int inobtcnt_enabled; isint = geo->logstart >0 ; lazycount = geo->flags &XFS_FSOP_GEOM_FLAGS_LAZYSB ?1 :0 ;
@@ -45,12 +46,13 @@ xfs_report_geom( rmapbt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_RMAPBT ?1 :0 ; reflink_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_REFLINK ?1 :0 ; bigtime_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_BIGTIME ?1 :0 ; + inobtcnt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_INOBTCNT ?1 :0 ; printf(_( "meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n" " =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n" " =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n" -" =%-22s reflink=%-4u bigtime=%u\n" +" =%-22s reflink=%-4u bigtime=%u, inobtcount=%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"
@@ -60,7 +62,7 @@ xfs_report_geom( mntpoint, geo->inodesize, geo->agcount, geo->agblocks,"" , geo->sectsize, attrversion, projid32bit,"" , crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled, -"" , reflink_enabled, bigtime_enabled, +"" , reflink_enabled, bigtime_enabled, inobtcnt_enabled,"" , geo->blocksize, (unsigned long long )geo->datablocks, geo->imaxpct, "", geo->sunit, geo->swidth,
libxfs/xfs_fs.h +1 -0
@@ -250,6 +250,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_RMAPBT (1 << 19)/* reverse mapping btree */ #define XFS_FSOP_GEOM_FLAGS_REFLINK (1 << 20)/* files can share blocks */ #define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21)/* 64-bit nsec timestamps */ +#define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22)/* inobt btree counter */ /* * Minimum and maximum sizes need for growth checks.
libxfs/xfs_sb.c +2 -0
@@ -1145,6 +1145,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_REFLINK ;if (xfs_sb_version_hasbigtime (sbp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_BIGTIME ; +if (xfs_sb_version_hasinobtcounts (sbp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_INOBTCNT ;if (xfs_sb_version_hassector (sbp)) geo->logsectsize = sbp->sb_logsectsize;else
Signature · 1 line
2.25.4
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>
Hi Zorro - thanks for spotting this.
I think the libxfs changes need to hit the kernel first, then we can pull it in and fix up the report_geom function. Nothing calls xfs_fs_geometry directly in userspace, FWIW.
Thanks,
-Eric
Quoted 68 lines
--- libfrog/fsgeom.c | 6 ++++-- libxfs/xfs_fs.h | 1 + libxfs/xfs_sb.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)libfrog/fsgeom.c +4
-2@@ -29,6 +29,7 @@ xfs_report_geom(int rmapbt_enabled;int reflink_enabled;int bigtime_enabled; +int inobtcnt_enabled; isint = geo->logstart >0 ; lazycount = geo->flags &XFS_FSOP_GEOM_FLAGS_LAZYSB ?1 :0 ;@@ -45,12 +46,13 @@ xfs_report_geom( rmapbt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_RMAPBT ?1 :0 ; reflink_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_REFLINK ?1 :0 ; bigtime_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_BIGTIME ?1 :0 ; + inobtcnt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_INOBTCNT ?1 :0 ; printf(_( "meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n" " =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n" " =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n" -" =%-22s reflink=%-4u bigtime=%u\n" +" =%-22s reflink=%-4u bigtime=%u, inobtcount=%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"@@ -60,7 +62,7 @@ xfs_report_geom( mntpoint, geo->inodesize, geo->agcount, geo->agblocks,"" , geo->sectsize, attrversion, projid32bit,"" , crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled, -"" , reflink_enabled, bigtime_enabled, +"" , reflink_enabled, bigtime_enabled, inobtcnt_enabled,"" , geo->blocksize, (unsigned long long )geo->datablocks, geo->imaxpct, "", geo->sunit, geo->swidth,libxfs/xfs_fs.h +1
-0@@ -250,6 +250,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_RMAPBT (1 << 19)/* reverse mapping btree */ #define XFS_FSOP_GEOM_FLAGS_REFLINK (1 << 20)/* files can share blocks */ #define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21)/* 64-bit nsec timestamps */ +#define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22)/* inobt btree counter */ /* * Minimum and maximum sizes need for growth checks. libxfs/xfs_sb.c +2
-0@@ -1145,6 +1145,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_REFLINK ;if (xfs_sb_version_hasbigtime (sbp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_BIGTIME ; +if (xfs_sb_version_hasinobtcounts (sbp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_INOBTCNT ;if (xfs_sb_version_hassector (sbp)) geo->logsectsize = sbp->sb_logsectsize;else
Quoted 10 lines · Eric Sandeen
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>Hi Zorro - thanks for spotting this.
I think the libxfs changes need to hit the kernel first, then we can pull it in and fix up the
report_geomfunction. Nothing callsxfs_fs_geometrydirectly in userspace, FWIW.
Hah, of course I forgot about libxfs_fs_geometry. o_O
In any case, I think this should hit the kernel first, want to send that patch if it's not already on the list?
-Eric
Quoted 3 lines
Thanks,
-Eric
Quoted 10 lines · Eric Sandeen
Quoted 7 lines · Eric Sandeen
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>Hi Zorro - thanks for spotting this.
Quoted 8 lines
Quoted 3 lines
I think the libxfs changes need to hit the kernel first, then we can pull it in and fix up the
report_geomfunction. Nothing callsxfs_fs_geometrydirectly in userspace, FWIW.Hah, of course I forgot about
libxfs_fs_geometry.o_OIn any case, I think this should hit the kernel first, want to send that patch if it's not already on the list?
I can give it a try, if Darrick haven't had one in his developing list :)
Thanks,
Zorro
Quoted 7 lines
-Eric
Quoted 3 lines
Thanks,
-Eric
Quoted 15 lines · Zorro Lang
Quoted 14 lines · Eric Sandeen
Quoted 10 lines · Eric Sandeen
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>Hi Zorro - thanks for spotting this.
I think the libxfs changes need to hit the kernel first, then we can pull it in and fix up the
report_geomfunction. Nothing callsxfs_fs_geometrydirectly in userspace, FWIW.
Quoted 6 lines
Quoted 4 lines
Hah, of course I forgot about
libxfs_fs_geometry.o_OIn any case, I think this should hit the kernel first, want to send that patch if it's not already on the list?
I can give it a try, if Darrick haven't had one in his developing list :)
Why do we need to expose INOBTCNT/inobtcount via the geometry ioctl? It doesn't expose any user-visible functionality.
--D
Quoted 11 lines
Thanks,
ZorroQuoted 7 lines
-Eric
Quoted 3 lines
Thanks,
-Eric
Quoted 18 lines · Darrick J. Wong
Quoted 17 lines · Zorro Lang
Quoted 16 lines · Eric Sandeen
Quoted 10 lines · Eric Sandeen
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>Hi Zorro - thanks for spotting this.
I think the libxfs changes need to hit the kernel first, then we can pull it in and fix up the
report_geomfunction. Nothing callsxfs_fs_geometrydirectly in userspace, FWIW.Hah, of course I forgot about
libxfs_fs_geometry.o_O
Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
In any case, I think this should hit the kernel first, want to send that patch if it's not already on the list?
I can give it a try, if Darrick haven't had one in his developing list :)
Why do we need to expose INOBTCNT/inobtcount via the geometry ioctl? It doesn't expose any user-visible functionality.
Just to follow up, my thought here is that mkfs output / xfs_info output should reflect what's needed to create a filesystem w/ the same geometry/features, and since this is a mkfs option, it should be reflected.
Darrick already RVB'd the kernel patch, so we're now just cruising along like a well-oiled machine. ;)
-Eric
Quoted 4 lines · Zorro Lang
When set inobtcount=1/0, we can't see it from xfs geometry report. So make it visible.
Signed-off-by Zorro Lang <[email protected]>
When the libxfs/kernel patch is in place, I'll merge the userspace part of this, thanks.
Quoted 68 lines
--- libfrog/fsgeom.c | 6 ++++-- libxfs/xfs_fs.h | 1 + libxfs/xfs_sb.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)libfrog/fsgeom.c +4
-2@@ -29,6 +29,7 @@ xfs_report_geom(int rmapbt_enabled;int reflink_enabled;int bigtime_enabled; +int inobtcnt_enabled; isint = geo->logstart >0 ; lazycount = geo->flags &XFS_FSOP_GEOM_FLAGS_LAZYSB ?1 :0 ;@@ -45,12 +46,13 @@ xfs_report_geom( rmapbt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_RMAPBT ?1 :0 ; reflink_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_REFLINK ?1 :0 ; bigtime_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_BIGTIME ?1 :0 ; + inobtcnt_enabled = geo->flags &XFS_FSOP_GEOM_FLAGS_INOBTCNT ?1 :0 ; printf(_( "meta-data=%-22s isize=%-6d agcount=%u, agsize=%u blks\n" " =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n" " =%-22s crc=%-8u finobt=%u, sparse=%u, rmapbt=%u\n" -" =%-22s reflink=%-4u bigtime=%u\n" +" =%-22s reflink=%-4u bigtime=%u, inobtcount=%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"@@ -60,7 +62,7 @@ xfs_report_geom( mntpoint, geo->inodesize, geo->agcount, geo->agblocks,"" , geo->sectsize, attrversion, projid32bit,"" , crcs_enabled, finobt_enabled, spinodes, rmapbt_enabled, -"" , reflink_enabled, bigtime_enabled, +"" , reflink_enabled, bigtime_enabled, inobtcnt_enabled,"" , geo->blocksize, (unsigned long long )geo->datablocks, geo->imaxpct, "", geo->sunit, geo->swidth,libxfs/xfs_fs.h +1
-0@@ -250,6 +250,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_RMAPBT (1 << 19)/* reverse mapping btree */ #define XFS_FSOP_GEOM_FLAGS_REFLINK (1 << 20)/* files can share blocks */ #define XFS_FSOP_GEOM_FLAGS_BIGTIME (1 << 21)/* 64-bit nsec timestamps */ +#define XFS_FSOP_GEOM_FLAGS_INOBTCNT (1 << 22)/* inobt btree counter */ /* * Minimum and maximum sizes need for growth checks. libxfs/xfs_sb.c +2
-0@@ -1145,6 +1145,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_REFLINK ;if (xfs_sb_version_hasbigtime (sbp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_BIGTIME ; +if (xfs_sb_version_hasinobtcounts (sbp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_INOBTCNT ;if (xfs_sb_version_hassector (sbp)) geo->logsectsize = sbp->sb_logsectsize;else