xfsprogs: add dtype support to mkfs and db

Now that we have an extra field in the dirent, add support into
xfs_db to be able to view it when looking at directory structures.

Add support to mkfs to create filesystems with filetype - we'll
always set it on CRC enabled filesystems so all new v5 filesystems
will have this functionality enabled.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>

diff --git a/db/dir2.c b/db/dir2.c
index 39042b3622c6b43d2f50a91362aa4ede95875d27..8b08d48aaacc2a5792776230f6a7cf5b6f66ffb0 100644 (file)
--- a/db/dir2.c
+++ b/db/dir2.c
@@ -596,6 +596,25 @@ dir2_data_union_size(
        }
 }
 
+static int
+dir3_data_union_ftype_offset(
+       void                    *obj,
+       int                     startoff,
+       int                     idx)
+{
+       xfs_dir2_data_entry_t   *dep;
+       xfs_dir2_data_unused_t  *dup;
+
+       ASSERT(bitoffs(startoff) == 0);
+       ASSERT(idx == 0);
+       dup = (xfs_dir2_data_unused_t *)((char *)obj + byteize(startoff));
+       if (be16_to_cpu(dup->freetag) == XFS_DIR2_DATA_FREE_TAG)
+               return bitize((int)((char *)xfs_dir2_data_unused_tag_p(dup) -
+                                   (char *)dup));
+       dep = (xfs_dir2_data_entry_t *)dup;
+       return bitize((int)((char *)&dep->name[dep->namelen] - (char *)dep));
+}
+
 /*
  * Free block functions
  */
@@ -851,7 +870,7 @@ const field_t       dir3_hfld[] = {
 const field_t  dir3_flds[] = {
        { "bhdr", FLDT_DIR3_DATA_HDR, OI(B3OFF(hdr)), dir3_block_hdr_count,
          FLD_COUNT, TYP_NONE },
-       { "bu", FLDT_DIR2_DATA_UNION, dir2_block_u_offset, dir2_block_u_count,
+       { "bu", FLDT_DIR3_DATA_UNION, dir2_block_u_offset, dir2_block_u_count,
          FLD_ARRAY|FLD_OFFSET|FLD_COUNT, TYP_NONE },
        { "bleaf", FLDT_DIR2_LEAF_ENTRY, dir2_block_leaf_offset,
          dir2_block_leaf_count, FLD_ARRAY|FLD_OFFSET|FLD_COUNT, TYP_NONE },
@@ -859,7 +878,7 @@ const field_t       dir3_flds[] = {
          dir3_block_tail_count, FLD_OFFSET|FLD_COUNT, TYP_NONE },
        { "dhdr", FLDT_DIR3_DATA_HDR, OI(D3OFF(hdr)), dir3_data_hdr_count,
          FLD_COUNT, TYP_NONE },
-       { "du", FLDT_DIR2_DATA_UNION, dir2_data_u_offset, dir2_data_u_count,
+       { "du", FLDT_DIR3_DATA_UNION, dir2_data_u_offset, dir2_data_u_count,
          FLD_ARRAY|FLD_OFFSET|FLD_COUNT, TYP_NONE },
        { "lhdr", FLDT_DIR3_LEAF_HDR, OI(L3OFF(hdr)), dir3_leaf_hdr_count,
          FLD_COUNT, TYP_NONE },
@@ -880,6 +899,26 @@ const field_t      dir3_flds[] = {
        { NULL }
 };
 
+#define        D3EOFF(f)       bitize(offsetof(xfs_dir2_data_entry_t, f))
+#define        D3UOFF(f)       bitize(offsetof(xfs_dir2_data_unused_t, f))
+const field_t  dir3_data_union_flds[] = {
+       { "freetag", FLDT_UINT16X, OI(D3UOFF(freetag)),
+         dir2_data_union_freetag_count, FLD_COUNT, TYP_NONE },
+       { "inumber", FLDT_INO, OI(D3EOFF(inumber)),
+         dir2_data_union_inumber_count, FLD_COUNT, TYP_INODE },
+       { "length", FLDT_DIR2_DATA_OFF, OI(D3UOFF(length)),
+         dir2_data_union_length_count, FLD_COUNT, TYP_NONE },
+       { "namelen", FLDT_UINT8D, OI(D3EOFF(namelen)),
+         dir2_data_union_namelen_count, FLD_COUNT, TYP_NONE },
+       { "name", FLDT_CHARNS, OI(D3EOFF(name)), dir2_data_union_name_count,
+         FLD_COUNT, TYP_NONE },
+       { "filetype", FLDT_UINT8D, dir3_data_union_ftype_offset, C1,
+         FLD_OFFSET, TYP_NONE },
+       { "tag", FLDT_DIR2_DATA_OFF, dir2_data_union_tag_offset,
+         dir2_data_union_tag_count, FLD_OFFSET|FLD_COUNT, TYP_NONE },
+       { NULL }
+};
+
 #define        DBH3OFF(f)      bitize(offsetof(struct xfs_dir3_blk_hdr, f))
 const field_t  dir3_blkhdr_flds[] = {
        { "magic", FLDT_UINT32X, OI(DBH3OFF(magic)), C1, 0, TYP_NONE },

diff --git a/db/dir2.h b/db/dir2.h
index d9dc27bba6929841289bc3f60234c7b430d6dec5..b3651d577b8fc0d7a5cee1ef421e32f299bb5432 100644 (file)
--- a/db/dir2.h
+++ b/db/dir2.h
@@ -48,6 +48,7 @@ extern const field_t  dir3_blkhdr_flds[];
 extern const field_t   dir3_data_hdr_flds[];
 extern const field_t   dir3_free_hdr_flds[];
 extern const field_t   dir3_leaf_hdr_flds[];
+extern const field_t   dir3_data_union_flds[];
 
 extern const field_t   da3_blkinfo_flds[];
 extern const field_t   da3_node_hdr_flds[];

diff --git a/db/dir2sf.c b/db/dir2sf.c
index d628641eca89e9ca91ed996dbfceace3ae1e43bb..528564780758b7159cc3657b35b6dffd42869fa3 100644 (file)
--- a/db/dir2sf.c
+++ b/db/dir2sf.c
@@ -127,7 +127,6 @@ dir2_sf_entry_name_count(
        return e->namelen;
 }
 
-/*ARGSUSED*/
 static int
 dir2_sf_entry_inumber_offset(
        void                    *obj,
@@ -142,6 +141,35 @@ dir2_sf_entry_inumber_offset(
        return bitize((int)((char *)xfs_dir2_sf_inumberp(e) - (char *)e));
 }
 
+static int
+dir3_sf_entry_inumber_offset(
+       void                    *obj,
+       int                     startoff,
+       int                     idx)
+{
+       xfs_dir2_sf_entry_t     *e;
+
+       ASSERT(bitoffs(startoff) == 0);
+       ASSERT(idx == 0);
+       e = (xfs_dir2_sf_entry_t *)((char *)obj + byteize(startoff));
+       /* plus 1 to skip the ftype entry */
+       return bitize((int)((char *)xfs_dir2_sf_inumberp(e) + 1 - (char *)e));
+}
+
+static int
+dir3_sf_entry_ftype_offset(
+       void                    *obj,
+       int                     startoff,
+       int                     idx)
+{
+       xfs_dir2_sf_entry_t     *e;
+
+       ASSERT(bitoffs(startoff) == 0);
+       ASSERT(idx == 0);
+       e = (xfs_dir2_sf_entry_t *)((char *)obj + byteize(startoff));
+       return bitize((int)((char *)&e->name[e->namelen] - (char *)e));
+}
+
 int
 dir2_sf_entry_size(
        void                    *obj,
@@ -224,3 +252,25 @@ dir2sf_size(
                e = xfs_dir3_sf_nextentry(mp, sf, e);
        return bitize((int)((char *)e - (char *)sf));
 }
+
+#define        OFF(f)  bitize(offsetof(struct xfs_dir2_sf_hdr, f))
+const field_t  dir3sf_flds[] = {
+       { "hdr", FLDT_DIR2_SF_HDR, OI(OFF(count)), C1, 0, TYP_NONE },
+       { "list", FLDT_DIR3_SF_ENTRY, dir2_sf_list_offset, dir2_sf_list_count,
+         FLD_ARRAY|FLD_COUNT|FLD_OFFSET, TYP_NONE },
+       { NULL }
+};
+
+#define        E3OFF(f)        bitize(offsetof(xfs_dir2_sf_entry_t, f))
+const field_t  dir3_sf_entry_flds[] = {
+       { "namelen", FLDT_UINT8D, OI(EOFF(namelen)), C1, 0, TYP_NONE },
+       { "offset", FLDT_DIR2_SF_OFF, OI(EOFF(offset)), C1, 0, TYP_NONE },
+       { "name", FLDT_CHARNS, OI(EOFF(name)), dir2_sf_entry_name_count,
+         FLD_COUNT, TYP_NONE },
+       { "inumber", FLDT_DIR2_INOU, dir3_sf_entry_inumber_offset, C1,
+         FLD_OFFSET, TYP_NONE },
+       { "filetype", FLDT_UINT8D, dir3_sf_entry_ftype_offset, C1,
+         FLD_OFFSET, TYP_NONE },
+       { NULL }
+};
+

diff --git a/db/dir2sf.h b/db/dir2sf.h
index 66d229ce15fa14056a1ed52b893bbb1252d37b63..cabe5b4d1bb57e89a1f5d6fcb55c2614adf75247 100644 (file)
--- a/db/dir2sf.h
+++ b/db/dir2sf.h
@@ -21,6 +21,9 @@ extern const field_t  dir2_inou_flds[];
 extern const field_t   dir2_sf_hdr_flds[];
 extern const field_t   dir2_sf_entry_flds[];
 
+extern const field_t   dir3sf_flds[];
+extern const field_t   dir3_sf_entry_flds[];
+
 extern int     dir2sf_size(void *obj, int startoff, int idx);
 extern int     dir2_inou_size(void *obj, int startoff, int idx);
 extern int     dir2_sf_entry_size(void *obj, int startoff, int idx);

diff --git a/db/field.c b/db/field.c
index e4f6c7da254ad0962bf180ad41a2957d124d70d4..c6d74044398c7c06d3d94cedb86e8a0d5a7cb3b4 100644 (file)
--- a/db/field.c
+++ b/db/field.c
@@ -235,6 +235,13 @@ const ftattr_t     ftattrtab[] = {
          SI(bitsz(struct xfs_dir3_free_hdr)), 0, NULL, dir3_free_hdr_flds },
        { FLDT_DIR3_LEAF_HDR, "dir3_leaf_hdr", NULL, (char *)dir3_leaf_hdr_flds,
          SI(bitsz(struct xfs_dir3_leaf_hdr)), 0, NULL, dir3_leaf_hdr_flds },
+       { FLDT_DIR3_DATA_UNION, "dir3_data_union", NULL,
+         (char *)dir3_data_union_flds, dir2_data_union_size, FTARG_SIZE, NULL,
+         dir3_data_union_flds },
+       { FLDT_DIR3_SF_ENTRY, "dir3_sf_entry", NULL, (char *)dir3_sf_entry_flds,
+         dir2_sf_entry_size, FTARG_SIZE, NULL, dir3_sf_entry_flds },
+       { FLDT_DIR3SF, "dir3sf", NULL, (char *)dir3sf_flds, dir2sf_size,
+         FTARG_SIZE, NULL, dir3sf_flds },
 
 /* dir v2/3 node fields */
        { FLDT_DA_BLKINFO, "dir_blkinfo", NULL, (char *)da_blkinfo_flds,

diff --git a/db/field.h b/db/field.h
index b97d917907019021391af2b099a1bf46cc7c2f91..aecdf9fda0ad2adbc043eba29a2ea0f0e004a1c6 100644 (file)
--- a/db/field.h
+++ b/db/field.h
@@ -116,6 +116,9 @@ typedef enum fldt   {
        FLDT_DIR3_DATA_HDR,
        FLDT_DIR3_FREE_HDR,
        FLDT_DIR3_LEAF_HDR,
+       FLDT_DIR3_DATA_UNION,
+       FLDT_DIR3_SF_ENTRY,
+       FLDT_DIR3SF,
 
        /* dir v2/3 node fields */
        FLDT_DA_BLKINFO,

diff --git a/db/inode.c b/db/inode.c
index eafbbd561dad9ce364cb25b4c12a9bf34b600a06..634dc309f398286e23157f0874005f36a0d14c1c 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -47,6 +47,7 @@ static int    inode_u_c_count(void *obj, int startoff);
 static int     inode_u_dev_count(void *obj, int startoff);
 static int     inode_u_muuid_count(void *obj, int startoff);
 static int     inode_u_sfdir2_count(void *obj, int startoff);
+static int     inode_u_sfdir3_count(void *obj, int startoff);
 static int     inode_u_symlink_count(void *obj, int startoff);
 
 static const cmdinfo_t inode_cmd =
@@ -78,7 +79,7 @@ const field_t inode_crc_flds[] = {
        { "next_unlinked", FLDT_AGINO, OI(OFF(next_unlinked)), C1, 0,
          TYP_INODE },
        { "v3", FLDT_DINODE_V3, OI(OFF(magic)), C1, 0, TYP_NONE },
-       { "u", FLDT_DINODE_U, inode_u_offset, C1, FLD_OFFSET, TYP_NONE },
+       { "u3", FLDT_DINODE_U, inode_u_offset, C1, FLD_OFFSET, TYP_NONE },
        { "a", FLDT_DINODE_A, inode_a_offset, inode_a_count,
          FLD_COUNT|FLD_OFFSET, TYP_NONE },
        { NULL }
@@ -193,6 +194,7 @@ const field_t       inode_u_flds[] = {
        { "dev", FLDT_DEV, NULL, inode_u_dev_count, FLD_COUNT, TYP_NONE },
        { "muuid", FLDT_UUID, NULL, inode_u_muuid_count, FLD_COUNT, TYP_NONE },
        { "sfdir2", FLDT_DIR2SF, NULL, inode_u_sfdir2_count, FLD_COUNT, TYP_NONE },
+       { "sfdir3", FLDT_DIR3SF, NULL, inode_u_sfdir3_count, FLD_COUNT, TYP_NONE },
        { "symlink", FLDT_CHARNS, NULL, inode_u_symlink_count, FLD_COUNT,
          TYP_NONE },
        { NULL }
@@ -557,7 +559,24 @@ inode_u_sfdir2_count(
        ASSERT((char *)XFS_DFORK_DPTR(dip) - (char *)dip == byteize(startoff));
        return dip->di_format == XFS_DINODE_FMT_LOCAL &&
               (be16_to_cpu(dip->di_mode) & S_IFMT) == S_IFDIR &&
-              xfs_sb_version_hasdirv2(&mp->m_sb);
+              xfs_sb_version_hasdirv2(&mp->m_sb) &&
+              !xfs_sb_version_hasftype(&mp->m_sb);
+}
+
+static int
+inode_u_sfdir3_count(
+       void            *obj,
+       int             startoff)
+{
+       xfs_dinode_t    *dip;
+
+       ASSERT(bitoffs(startoff) == 0);
+       ASSERT(obj == iocur_top->data);
+       dip = obj;
+       ASSERT((char *)XFS_DFORK_DPTR(dip) - (char *)dip == byteize(startoff));
+       return dip->di_format == XFS_DINODE_FMT_LOCAL &&
+              (be16_to_cpu(dip->di_mode) & S_IFMT) == S_IFDIR &&
+              xfs_sb_version_hasftype(&mp->m_sb);
 }
 
 int

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 896351bfc60657f867a553901e6a7e1f94cb41fd..eafbed3edbcdf6c8d2f005e67feaffd205bc6aa9 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2520,6 +2520,13 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"),
                                        (sectorsize != BBSIZE ||
                                                        lsectorsize != BBSIZE),
                                        nci, sbp->sb_features2 != 0);
+       /*
+        * dirent filetype field always enabled on v5 superblocks
+        */
+       if (crcs_enabled) {
+               sbp->sb_features_incompat = XFS_SB_FEAT_INCOMPAT_FTYPE;
+       }
+
        /*
         * Due to a structure alignment issue, sb_features2 ended up in one
         * of two locations, the second "incorrect" location represented by