xfs: hoist xfs_fs_geometry to libxfs

Source kernel commit: c368ebcd4cc3bbc08602adce083ad3cc76a15258

Move xfs_fs_geometry to libxfs so that we can clean up the fs geometry
reporting in xfsprogs.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index a339a84bdb2c8f2649d0388ffa9c3d75cb76a121..bba149af380d0180da561c17b1bf3c2b391f933c 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -37,6 +37,8 @@
 #include "xfs_rmap_btree.h"
 #include "xfs_bmap.h"
 #include "xfs_refcount_btree.h"
+#include "xfs_da_format.h"
+#include "xfs_da_btree.h"
 
 /*
  * Physical superblock buffer manipulations. Shared with libxfs in userspace.
@@ -856,3 +858,80 @@ xfs_sync_sb(
                xfs_trans_set_sync(tp);
        return xfs_trans_commit(tp);
 }
+
+int
+xfs_fs_geometry(
+       xfs_mount_t             *mp,
+       xfs_fsop_geom_t         *geo,
+       int                     new_version)
+{
+
+       memset(geo, 0, sizeof(*geo));
+
+       geo->blocksize = mp->m_sb.sb_blocksize;
+       geo->rtextsize = mp->m_sb.sb_rextsize;
+       geo->agblocks = mp->m_sb.sb_agblocks;
+       geo->agcount = mp->m_sb.sb_agcount;
+       geo->logblocks = mp->m_sb.sb_logblocks;
+       geo->sectsize = mp->m_sb.sb_sectsize;
+       geo->inodesize = mp->m_sb.sb_inodesize;
+       geo->imaxpct = mp->m_sb.sb_imax_pct;
+       geo->datablocks = mp->m_sb.sb_dblocks;
+       geo->rtblocks = mp->m_sb.sb_rblocks;
+       geo->rtextents = mp->m_sb.sb_rextents;
+       geo->logstart = mp->m_sb.sb_logstart;
+       ASSERT(sizeof(geo->uuid) == sizeof(mp->m_sb.sb_uuid));
+       memcpy(geo->uuid, &mp->m_sb.sb_uuid, sizeof(mp->m_sb.sb_uuid));
+       if (new_version >= 2) {
+               geo->sunit = mp->m_sb.sb_unit;
+               geo->swidth = mp->m_sb.sb_width;
+       }
+       if (new_version >= 3) {
+               geo->version = XFS_FSOP_GEOM_VERSION;
+               geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK |
+                            XFS_FSOP_GEOM_FLAGS_DIRV2 |
+                       (xfs_sb_version_hasattr(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_ATTR : 0) |
+                       (xfs_sb_version_hasquota(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_QUOTA : 0) |
+                       (xfs_sb_version_hasalign(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_IALIGN : 0) |
+                       (xfs_sb_version_hasdalign(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_DALIGN : 0) |
+                       (xfs_sb_version_hasextflgbit(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_EXTFLG : 0) |
+                       (xfs_sb_version_hassector(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_SECTOR : 0) |
+                       (xfs_sb_version_hasasciici(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_DIRV2CI : 0) |
+                       (xfs_sb_version_haslazysbcount(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_LAZYSB : 0) |
+                       (xfs_sb_version_hasattr2(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_ATTR2 : 0) |
+                       (xfs_sb_version_hasprojid32bit(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_PROJID32 : 0) |
+                       (xfs_sb_version_hascrc(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_V5SB : 0) |
+                       (xfs_sb_version_hasftype(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_FTYPE : 0) |
+                       (xfs_sb_version_hasfinobt(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_FINOBT : 0) |
+                       (xfs_sb_version_hassparseinodes(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_SPINODES : 0) |
+                       (xfs_sb_version_hasrmapbt(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_RMAPBT : 0) |
+                       (xfs_sb_version_hasreflink(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_REFLINK : 0);
+               geo->logsectsize = xfs_sb_version_hassector(&mp->m_sb) ?
+                               mp->m_sb.sb_logsectsize : BBSIZE;
+               geo->rtsectsize = mp->m_sb.sb_blocksize;
+               geo->dirblocksize = mp->m_dir_geo->blksize;
+       }
+       if (new_version >= 4) {
+               geo->flags |=
+                       (xfs_sb_version_haslogv2(&mp->m_sb) ?
+                               XFS_FSOP_GEOM_FLAGS_LOGV2 : 0);
+               geo->logsunit = mp->m_sb.sb_logsunit;
+       }
+       return 0;
+}

diff --git a/libxfs/xfs_sb.h b/libxfs/xfs_sb.h
index 961e6475a3099bb9acf2c5df67f355f35ffbb3c7..a16632c2a332393dd5c90d486f44d7183194b40a 100644 (file)
--- a/libxfs/xfs_sb.h
+++ b/libxfs/xfs_sb.h
@@ -34,4 +34,7 @@ extern void   xfs_sb_from_disk(struct xfs_sb *to, struct xfs_dsb *from);
 extern void    xfs_sb_to_disk(struct xfs_dsb *to, struct xfs_sb *from);
 extern void    xfs_sb_quota_from_disk(struct xfs_sb *sbp);
 
+extern int     xfs_fs_geometry(struct xfs_mount *mp, struct xfs_fsop_geom *geo,
+                               int nversion);
+
 #endif /* __XFS_SB_H__ */