xfs
[Top] [All Lists]

[PATCH 2/4] xfsprogs: support CRC enabled filesystem detection

To: xfs@xxxxxxxxxxx
Subject: [PATCH 2/4] xfsprogs: support CRC enabled filesystem detection
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Mon, 27 May 2013 17:14:54 +1000
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1369638896-24872-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1369312565-6266-1-git-send-email-david@xxxxxxxxxxxxx> <1369638896-24872-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

Add the XFS_FSOP_GEOM_FLAGS_V5SB flag to the XFS_IOC_FSGEOMETRY
ioctl to allow utilities like xfs_info to detect that the filesystem
is CRC enabled.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 growfs/xfs_growfs.c |    9 +++++++--
 include/xfs_fs.h    |    1 +
 mkfs/xfs_mkfs.c     |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/growfs/xfs_growfs.c b/growfs/xfs_growfs.c
index 5d544da..7d80f84 100644
--- a/growfs/xfs_growfs.c
+++ b/growfs/xfs_growfs.c
@@ -53,11 +53,13 @@ report_info(
        int             dirversion,
        int             logversion,
        int             attrversion,
+       int             crcs_enabled,
        int             cimode)
 {
        printf(_(
            "meta-data=%-22s isize=%-6u agcount=%u, agsize=%u blks\n"
            "         =%-22s sectsz=%-5u attr=%u\n"
+           "         =%-22s crc=%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\n"
@@ -67,6 +69,7 @@ report_info(
 
                mntpoint, geo.inodesize, geo.agcount, geo.agblocks,
                "", geo.sectsize, attrversion,
+               "", crcs_enabled,
                "", geo.blocksize, (unsigned long long)geo.datablocks,
                        geo.imaxpct,
                "", geo.sunit, geo.swidth,
@@ -115,6 +118,7 @@ main(int argc, char **argv)
        char                    *rtdev; /*   RT device name */
        fs_path_t               *fs;    /* mount point information */
        libxfs_init_t           xi;     /* libxfs structure */
+       int                     crcs_enabled;
 
        progname = basename(argv[0]);
        setlocale(LC_ALL, "");
@@ -234,10 +238,11 @@ main(int argc, char **argv)
        attrversion = geo.flags & XFS_FSOP_GEOM_FLAGS_ATTR2 ? 2 : \
                        (geo.flags & XFS_FSOP_GEOM_FLAGS_ATTR ? 1 : 0);
        ci = geo.flags & XFS_FSOP_GEOM_FLAGS_DIRV2CI ? 1 : 0;
+       crcs_enabled = geo.flags & XFS_FSOP_GEOM_FLAGS_V5SB ? 1 : 0;
        if (nflag) {
                report_info(geo, datadev, isint, logdev, rtdev,
                                lazycount, dirversion, logversion,
-                               attrversion, ci);
+                               attrversion, crcs_enabled, ci);
                exit(0);
        }
 
@@ -274,7 +279,7 @@ main(int argc, char **argv)
 
        report_info(geo, datadev, isint, logdev, rtdev,
                        lazycount, dirversion, logversion,
-                       attrversion, ci);
+                       attrversion, crcs_enabled, ci);
 
        ddsize = xi.dsize;
        dlsize = ( xi.logBBsize? xi.logBBsize :
diff --git a/include/xfs_fs.h b/include/xfs_fs.h
index 1cc1aa0..44b69e7 100644
--- a/include/xfs_fs.h
+++ b/include/xfs_fs.h
@@ -236,6 +236,7 @@ typedef struct xfs_fsop_resblks {
 #define XFS_FSOP_GEOM_FLAGS_PROJID32   0x0800  /* 32-bit project IDs   */
 #define XFS_FSOP_GEOM_FLAGS_DIRV2CI    0x1000  /* ASCII only CI names  */
 #define XFS_FSOP_GEOM_FLAGS_LAZYSB     0x4000  /* lazy superblock counters */
+#define XFS_FSOP_GEOM_FLAGS_V5SB       0x8000  /* version 5 superblock */
 
 
 /*
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index dad7dab..9bc672e 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2425,7 +2425,7 @@ an AG size that is one stripe unit smaller, for example 
%llu.\n"),
                printf(_(
                   "meta-data=%-22s isize=%-6d agcount=%lld, agsize=%lld blks\n"
                   "         =%-22s sectsz=%-5u attr=%u, projid32bit=%u\n"
-                  "         =%-22s crc=%-5u\n"
+                  "         =%-22s crc=%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\n"
-- 
1.7.10.4

<Prev in Thread] Current Thread [Next in Thread>