allow UUID changes on V5/CRC filesystems
v6 cover allow UUID changes on V5/CRC filesystems
Ok, hopefully this is truly the final version of the patchset to allow UUID changes on V5 filesystems; testcase included now.
Thanks,
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v6 1/3 xfs: create new metadata UUID field and incompat flag
This adds a new superblock field, sb_meta_uuid. If set, along with a new incompat flag, the code will use that field on a V5 filesystem to compare to metadata UUIDs, which allows us to change the user- visible UUID at will. Userspace handles the setting and clearing of the incompat flag as appropriate, as the UUID gets changed; i.e. setting the user-visible UUID back to the original UUID (as stored in the new field) will remove the incompatible feature flag.
If the incompat flag is not set, this copies the user-visible UUID into into the meta_uuid slot in memory when the superblock is read from disk; the meta_uuid field is not written back to disk in this case.
The remainder of this patch simply switches verifiers, initializers, etc to use the new sb_meta_uuid field.
Signed-off-by Eric Sandeen <[email protected]>
---
fs/xfs/libxfs/xfs_alloc.c +2 -2
@@ -464,7 +464,7 @@ xfs_agfl_verify(struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp);int i; -if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be32_to_cpu (agfl->agfl_magicnum) !=XFS_AGFL_MAGIC )return false;
@@ -2260,7 +2260,7 @@ xfs_agf_verify(struct xfs_agf *agf =XFS_BUF_TO_AGF (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))return false; if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&
fs/xfs/libxfs/xfs_alloc_btree.c +2 -2
@@ -295,7 +295,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTB_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
@@ -313,7 +313,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTC_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
fs/xfs/libxfs/xfs_attr_leaf.c +2 -2
@@ -262,7 +262,7 @@ xfs_attr3_leaf_verify(if (ichdr.magic !=XFS_ATTR3_LEAF_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;
@@ -1056,7 +1056,7 @@ xfs_attr3_leaf_create( hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); ichdr.freemap[0 ].base =sizeof (struct xfs_attr3_leaf_hdr ); }else {
fs/xfs/libxfs/xfs_attr_remote.c +2 -2
@@ -100,7 +100,7 @@ xfs_attr3_rmt_verify(return false;if (rmt->rm_magic !=cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ))return false; -if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (rmt->rm_blkno) != bno)return false;
@@ -217,7 +217,7 @@ xfs_attr3_rmt_hdr_set( rmt->rm_magic =cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ); rmt->rm_offset =cpu_to_be32 (offset); rmt->rm_bytes =cpu_to_be32 (size); -uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid); rmt->rm_owner =cpu_to_be64 (ino); rmt->rm_blkno =cpu_to_be64 (bno);
fs/xfs/libxfs/xfs_bmap_btree.c +3 -2
@@ -349,7 +349,8 @@ xfs_bmbt_to_bmdr(if (xfs_sb_version_hascrc (&mp->m_sb)) {ASSERT (rblock->bb_magic ==cpu_to_be32 (XFS_BMAP_CRC_MAGIC )); -ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)); +ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid));ASSERT (rblock->bb_u.l.bb_blkno ==cpu_to_be64 (XFS_BUF_DADDR_NULL )); }else
@@ -647,7 +648,7 @@ xfs_bmbt_verify(case cpu_to_be32 (XFS_BMAP_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (block->bb_u.l.bb_blkno) != bp->b_bn)return false;
fs/xfs/libxfs/xfs_btree.c +6 -4
@@ -65,7 +65,8 @@ xfs_btree_check_lblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { lblock_ok = lblock_ok && -uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.l.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }
@@ -115,7 +116,8 @@ xfs_btree_check_sblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { sblock_ok = sblock_ok && -uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.s.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.s.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }
@@ -1000,7 +1002,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.l.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.l.bb_owner =cpu_to_be64 (owner); -uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.l.bb_pad =0 ; buf->bb_u.l.bb_lsn =0 ; }
@@ -1013,7 +1015,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.s.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.s.bb_owner =cpu_to_be32 (__owner); -uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.s.bb_lsn =0 ; } }
fs/xfs/libxfs/xfs_da_btree.c +2 -2
@@ -146,7 +146,7 @@ xfs_da3_node_verify(if (ichdr.magic !=XFS_DA3_NODE_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;
@@ -324,7 +324,7 @@ xfs_da3_node_create( ichdr.magic =XFS_DA3_NODE_MAGIC ; hdr3->info.blkno =cpu_to_be64 (bp->b_bn); hdr3->info.owner =cpu_to_be64 (args->dp->i_ino); -uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid); }else { ichdr.magic =XFS_DA_NODE_MAGIC ; }
fs/xfs/libxfs/xfs_dir2_block.c +2 -2
@@ -67,7 +67,7 @@ xfs_dir3_block_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -157,7 +157,7 @@ xfs_dir3_block_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid);return ; }
fs/xfs/libxfs/xfs_dir2_data.c +2 -2
@@ -220,7 +220,7 @@ xfs_dir3_data_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_DATA_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -604,7 +604,7 @@ xfs_dir3_data_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_DATA_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); }else hdr->magic =cpu_to_be32 (XFS_DIR2_DATA_MAGIC );
fs/xfs/libxfs/xfs_dir2_leaf.c +2 -2
@@ -160,7 +160,7 @@ xfs_dir3_leaf_verify(if (leaf3->info.hdr.magic !=cpu_to_be16 (magic3))return false; -if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (leaf3->info.blkno) != bp->b_bn)return false;
@@ -310,7 +310,7 @@ xfs_dir3_leaf_init( : cpu_to_be16(XFS_DIR3_LEAFN_MAGIC); leaf3->info.blkno =cpu_to_be64 (bp->b_bn); leaf3->info.owner =cpu_to_be64 (owner); -uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid); }else {memset (leaf,0 ,sizeof (*leaf)); leaf->hdr.info.magic =cpu_to_be16 (type);
fs/xfs/libxfs/xfs_dir2_node.c +2 -2
@@ -93,7 +93,7 @@ xfs_dir3_free_verify(if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_FREE_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -226,7 +226,7 @@ xfs_dir3_free_get_buf( hdr3->hdr.blkno =cpu_to_be64 (bp->b_bn); hdr3->hdr.owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_meta_uuid); }else hdr.magic =XFS_DIR2_FREE_MAGIC ; dp->d_ops->free_hdr_to_disk (bp->b_addr, &hdr);
fs/xfs/libxfs/xfs_dquot_buf.c +2 -2
@@ -163,7 +163,7 @@ xfs_dqcheck( d->dd_diskdq.d_id =cpu_to_be32 (id);if (xfs_sb_version_hascrc (&mp->m_sb)) { -uuid_copy (&d->dd_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&d->dd_uuid, &mp->m_sb.sb_meta_uuid);xfs_update_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ); }
@@ -198,7 +198,7 @@ xfs_dquot_buf_verify_crc(if (!xfs_verify_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ))return false; -if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_meta_uuid))return false; }return true;
fs/xfs/libxfs/xfs_format.h +19 -3
@@ -100,7 +100,7 @@ typedef struct xfs_sb {xfs_rfsblock_t sb_dblocks;/* number of data blocks */ xfs_rfsblock_t sb_rblocks;/* number of realtime blocks */ xfs_rtblock_t sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ xfs_fsblock_t sb_logstart;/* starting block of log if internal */ xfs_ino_t sb_rootino;/* root inode number */ xfs_ino_t sb_rbmino;/* bitmap inode for realtime extents */
@@ -174,6 +174,7 @@ typedef struct xfs_sb {xfs_ino_t sb_pquotino;/* project quota inode */ xfs_lsn_t sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_sb_t;
@@ -190,7 +191,7 @@ typedef struct xfs_dsb {__be64 sb_dblocks;/* number of data blocks */ __be64 sb_rblocks;/* number of realtime blocks */ __be64 sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ __be64 sb_logstart;/* starting block of log if internal */ __be64 sb_rootino;/* root inode number */ __be64 sb_rbmino;/* bitmap inode for realtime extents */
@@ -260,6 +261,7 @@ typedef struct xfs_dsb {__be64 sb_pquotino;/* project quota inode */ __be64 sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_dsb_t;
@@ -458,9 +460,11 @@ xfs_sb_has_ro_compat_feature(#define XFS_SB_FEAT_INCOMPAT_FTYPE (1 << 0)/* filetype in dirent */ #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1)/* sparse inode chunks */ +#define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2)/* metadata UUID */ #define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ - XFS_SB_FEAT_INCOMPAT_SPINODES) + XFS_SB_FEAT_INCOMPAT_SPINODES| \ + XFS_SB_FEAT_INCOMPAT_META_UUID)#define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool
@@ -515,6 +519,18 @@ static inline bool xfs_sb_version_hassparseinodes(struct xfs_sb *sbp) }/* +* XFS_SB_FEAT_INCOMPAT_META_UUID indicates that the metadata UUID +* is stored separately from the user-visible UUID; this allows the +* user-visible UUID to be changed on V5 filesystems which have a +* filesystem UUID stamped into every piece of metadata. +*/ +static inline bool xfs_sb_version_hasmetauuid (struct xfs_sb *sbp) +{ +return (XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ) && + (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_META_UUID ); +} + +/* * end of superblock version macros */
fs/xfs/libxfs/xfs_ialloc.c +3 -2
@@ -338,7 +338,8 @@ xfs_ialloc_inode_init(if (version ==3 ) { free->di_ino =cpu_to_be64 (ino); ino++; -uuid_copy (&free->di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&free->di_uuid, + &mp->m_sb.sb_meta_uuid);xfs_dinode_calc_crc (mp, free); }else if (tp) {/* just log the inode core */
@@ -2500,7 +2501,7 @@ xfs_agi_verify(struct xfs_agi *agi =XFS_BUF_TO_AGI (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid))return false;/* * Validate the magic number of the agi block.
fs/xfs/libxfs/xfs_ialloc_btree.c +1 -1
@@ -239,7 +239,7 @@ xfs_inobt_verify(case cpu_to_be32 (XFS_FIBT_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
fs/xfs/libxfs/xfs_inode_buf.c +2 -2
@@ -304,7 +304,7 @@ xfs_dinode_verify(return false;if (be64_to_cpu (dip->di_ino) != ip->i_ino)return false; -if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_meta_uuid))return false;return true; }
@@ -366,7 +366,7 @@ xfs_iread(if (xfs_sb_version_hascrc (&mp->m_sb)) { ip->i_d.di_version =3 ; ip->i_d.di_ino = ip->i_ino; -uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); }else ip->i_d.di_version =2 ;return 0 ;
fs/xfs/libxfs/xfs_sb.c +10 -0
@@ -398,6 +398,14 @@ __xfs_sb_from_disk( to->sb_spino_align =be32_to_cpu (from->sb_spino_align); to->sb_pquotino =be64_to_cpu (from->sb_pquotino); to->sb_lsn =be64_to_cpu (from->sb_lsn); +/* +* sb_meta_uuid is only on disk if it differs from sb_uuid and the +* feature flag is set; if not set we keep it only in memory. +*/ +if (xfs_sb_version_hasmetauuid (to)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); +else +uuid_copy (&to->sb_meta_uuid, &from->sb_uuid);/* Convert on-disk flags to in-memory flags? */ if (convert_xquota)xfs_sb_quota_from_disk (to);
@@ -539,6 +547,8 @@ xfs_sb_to_disk(cpu_to_be32 (from->sb_features_log_incompat); to->sb_spino_align =cpu_to_be32 (from->sb_spino_align); to->sb_lsn =cpu_to_be64 (from->sb_lsn); +if (xfs_sb_version_hasmetauuid (from)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); } }
fs/xfs/libxfs/xfs_symlink_remote.c +2 -2
@@ -63,7 +63,7 @@ xfs_symlink_hdr_set( dsl->sl_magic =cpu_to_be32 (XFS_SYMLINK_MAGIC ); dsl->sl_offset =cpu_to_be32 (offset); dsl->sl_bytes =cpu_to_be32 (size); -uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid); dsl->sl_owner =cpu_to_be64 (ino); dsl->sl_blkno =cpu_to_be64 (bp->b_bn); bp->b_ops = &xfs_symlink_buf_ops;
@@ -107,7 +107,7 @@ xfs_symlink_verify(return false;if (dsl->sl_magic !=cpu_to_be32 (XFS_SYMLINK_MAGIC ))return false; -if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (bp->b_bn !=be64_to_cpu (dsl->sl_blkno))return false;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 1/3] xfs: create new metadata UUID field and incompat flag
Quoted 8 lines · Eric Sandeen
This adds a new superblock field,
sb_meta_uuid. If set, along with a new incompat flag, the code will use that field on a V5 filesystem to compare to metadata UUIDs, which allows us to change the user- visible UUID at will. Userspace handles the setting and clearing of the incompat flag as appropriate, as the UUID gets changed; i.e. setting the user-visible UUID back to the original UUID (as stored in the new field) will remove the incompatible feature flag.
Quoted 8 lines
If the incompat flag is not set, this copies the user-visible UUID into into the
meta_uuidslot in memory when the superblock is read from disk; themeta_uuidfield is not written back to disk in this case.The remainder of this patch simply switches verifiers, initializers, etc to use the new
sb_meta_uuidfield.Signed-off-by Eric Sandeen <[email protected]>
This one was also
Reviewed-by Brian Foster <[email protected]>
but again has small changes to address Dave's points, and rebase changes.
THanks,
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v6 2/3 xfsprogs: Add new sb_meta_uuid field, update userspace tools to manipulate it
In reply to Eric SandeenThis adds a new superblock field, sb_meta_uuid. This allows us to change the use-visible UUID on crc-enabled filesytems from userspace if desired, by copying the existing UUID to the new location for metadata comparisons. If this is done, an incompat flag must be set to prevent older filesystems from mounting the filesystem, but the original UUID can be restored, and the incompat flag removed, with a new xfs_db / xfs_admin UUID command, "restore."
Much of this patch mirrors the kernel patch in simply renaming the field used for metadata uuid comparison; other bits:
* Teach xfs_db to print the new meta_uuid field
* Allow xfs_db to generate a new UUID for CRC-enabled filesystems
* Allow xfs_db to revert to the original UUID and clear the flag
* Fix up xfs_copy to work with CRC-enabled filesystems
* Update the xfs_admin manpage to show the UUID "restore" command
Signed-off-by Eric Sandeen <[email protected]>
---
copy/xfs_copy.c +32 -12
@@ -25,6 +25,7 @@#include "xfs_copy.h" #define rounddown (x, y) (((x)/(y))*(y)) +#define uuid_equal (s,d) (platform_uuid_compare((s),(d)) == 0)extern int platform_check_ismounted (char *,char *,struct stat64 *,int );
@@ -466,6 +467,36 @@ write_wbuf(void)sighold (SIGCHLD ); } +void +sb_update_uuid ( +xfs_sb_t *sb, +ag_header_t *ag_hdr, +thread_args *tcarg) +{ +/* +* If this filesystem has CRCs, the original UUID is stamped into +* all metadata. If we are changing the UUID in the copy, we need +* to copy the original UUID into the meta_uuid slot and set the +* set the incompat flag if that hasn't already been done. +*/ +if (!uuid_equal (&tcarg->uuid, &ag_hdr->xfs_sb->sb_uuid) && +xfs_sb_version_hascrc (sb) && !xfs_sb_version_hasmetauuid (sb)) { +__be32 feat; + + feat =be32_to_cpu (ag_hdr->xfs_sb->sb_features_incompat); + feat |=XFS_SB_FEAT_INCOMPAT_META_UUID ; + ag_hdr->xfs_sb->sb_features_incompat =cpu_to_be32 (feat); +platform_uuid_copy (&ag_hdr->xfs_sb->sb_meta_uuid, + &ag_hdr->xfs_sb->sb_uuid); + } + +platform_uuid_copy (&ag_hdr->xfs_sb->sb_uuid, &tcarg->uuid); + +/* We may have changed the UUID, so update the superblock CRC */ +if (xfs_sb_version_hascrc (sb)) +xfs_update_cksum ((char *)ag_hdr->xfs_sb, sb->sb_sectsize, +XFS_SB_CRC_OFF ); +}int main (int argc,char **argv)
@@ -666,16 +697,6 @@ main(int argc, char **argv)1 << (sb->sb_sectlog -BBSHIFT ), 0, &xfs_sb_buf_ops); -/* -* For now, V5 superblock filesystems are not supported without -d; -* we do not have the infrastructure yet to fix CRCs when a new UUID -* is generated. -*/ -if (xfs_sb_version_hascrc (sb) && !duplicate) { -do_log (_ ("%s: Cannot yet copy V5 fs without '-d'\n" ), progname); -exit (1 ); - } - mp =libxfs_mount (&mbuf, sb, xargs.ddev, xargs.logdev, xargs.rtdev,0 );if (mp ==NULL ) { do_log(_("%s: %s filesystem failed to initialize\n"
@@ -1134,8 +1155,7 @@ main(int argc, char **argv)/* do each thread in turn, each has its own UUID */ for (j =0 , tcarg = targ; j < num_targets; j++) { -platform_uuid_copy (&ag_hdr.xfs_sb->sb_uuid, - &tcarg->uuid); +sb_update_uuid (sb, &ag_hdr, tcarg);do_write (tcarg); tcarg++; }
db/sb.c +42 -12
90 lines not on this page · raw message
libxfs/xfs_alloc.c +2 -2
@@ -460,7 +460,7 @@ xfs_agfl_verify(struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp);int i; -if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be32_to_cpu (agfl->agfl_magicnum) !=XFS_AGFL_MAGIC )return false;
@@ -2256,7 +2256,7 @@ xfs_agf_verify(struct xfs_agf *agf =XFS_BUF_TO_AGF (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))return false; if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&
libxfs/xfs_alloc_btree.c +2 -2
@@ -293,7 +293,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTB_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
@@ -311,7 +311,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTC_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
libxfs/xfs_attr_leaf.c +2 -2
@@ -258,7 +258,7 @@ xfs_attr3_leaf_verify(if (ichdr.magic !=XFS_ATTR3_LEAF_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;
@@ -1052,7 +1052,7 @@ xfs_attr3_leaf_create( hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); ichdr.freemap[0 ].base =sizeof (struct xfs_attr3_leaf_hdr ); }else {
libxfs/xfs_attr_remote.c +2 -2
@@ -95,7 +95,7 @@ xfs_attr3_rmt_verify(return false;if (rmt->rm_magic !=cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ))return false; -if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (rmt->rm_blkno) != bno)return false;
@@ -212,7 +212,7 @@ xfs_attr3_rmt_hdr_set( rmt->rm_magic =cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ); rmt->rm_offset =cpu_to_be32 (offset); rmt->rm_bytes =cpu_to_be32 (size); -uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid); rmt->rm_owner =cpu_to_be64 (ino); rmt->rm_blkno =cpu_to_be64 (bno);
libxfs/xfs_bmap_btree.c +3 -2
@@ -346,7 +346,8 @@ xfs_bmbt_to_bmdr(if (xfs_sb_version_hascrc (&mp->m_sb)) {ASSERT (rblock->bb_magic ==cpu_to_be32 (XFS_BMAP_CRC_MAGIC )); -ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)); +ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid));ASSERT (rblock->bb_u.l.bb_blkno ==cpu_to_be64 (XFS_BUF_DADDR_NULL )); }else
@@ -644,7 +645,7 @@ xfs_bmbt_verify(case cpu_to_be32 (XFS_BMAP_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (block->bb_u.l.bb_blkno) != bp->b_bn)return false;
libxfs/xfs_btree.c +6 -4
@@ -62,7 +62,8 @@ xfs_btree_check_lblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { lblock_ok = lblock_ok && -uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.l.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }
@@ -112,7 +113,8 @@ xfs_btree_check_sblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { sblock_ok = sblock_ok && -uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.s.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.s.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }
@@ -997,7 +999,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.l.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.l.bb_owner =cpu_to_be64 (owner); -uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.l.bb_pad =0 ; buf->bb_u.l.bb_lsn =0 ; }
@@ -1010,7 +1012,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.s.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.s.bb_owner =cpu_to_be32 (__owner); -uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.s.bb_lsn =0 ; } }
libxfs/xfs_da_btree.c +2 -2
@@ -142,7 +142,7 @@ xfs_da3_node_verify(if (ichdr.magic !=XFS_DA3_NODE_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;
@@ -320,7 +320,7 @@ xfs_da3_node_create( ichdr.magic =XFS_DA3_NODE_MAGIC ; hdr3->info.blkno =cpu_to_be64 (bp->b_bn); hdr3->info.owner =cpu_to_be64 (args->dp->i_ino); -uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid); }else { ichdr.magic =XFS_DA_NODE_MAGIC ; }
libxfs/xfs_dir2_block.c +2 -2
@@ -64,7 +64,7 @@ xfs_dir3_block_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -154,7 +154,7 @@ xfs_dir3_block_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid);return ; }
libxfs/xfs_dir2_data.c +2 -2
@@ -218,7 +218,7 @@ xfs_dir3_data_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_DATA_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -602,7 +602,7 @@ xfs_dir3_data_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_DATA_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); }else hdr->magic =cpu_to_be32 (XFS_DIR2_DATA_MAGIC );
libxfs/xfs_dir2_leaf.c +2 -2
@@ -158,7 +158,7 @@ xfs_dir3_leaf_verify(if (leaf3->info.hdr.magic !=cpu_to_be16 (magic3))return false; -if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (leaf3->info.blkno) != bp->b_bn)return false;
@@ -308,7 +308,7 @@ xfs_dir3_leaf_init( : cpu_to_be16(XFS_DIR3_LEAFN_MAGIC); leaf3->info.blkno =cpu_to_be64 (bp->b_bn); leaf3->info.owner =cpu_to_be64 (owner); -uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid); }else {memset (leaf,0 ,sizeof (*leaf)); leaf->hdr.info.magic =cpu_to_be16 (type);
libxfs/xfs_dir2_node.c +2 -2
@@ -91,7 +91,7 @@ xfs_dir3_free_verify(if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_FREE_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;
@@ -224,7 +224,7 @@ xfs_dir3_free_get_buf( hdr3->hdr.blkno =cpu_to_be64 (bp->b_bn); hdr3->hdr.owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_meta_uuid); }else hdr.magic =XFS_DIR2_FREE_MAGIC ; dp->d_ops->free_hdr_to_disk (bp->b_addr, &hdr);
libxfs/xfs_dquot_buf.c +2 -2
@@ -171,7 +171,7 @@ xfs_dqcheck( d->dd_diskdq.d_id =cpu_to_be32 (id);if (xfs_sb_version_hascrc (&mp->m_sb)) { -uuid_copy (&d->dd_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&d->dd_uuid, &mp->m_sb.sb_meta_uuid);xfs_update_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ); }
@@ -206,7 +206,7 @@ xfs_dquot_buf_verify_crc(if (!xfs_verify_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ))return false; -if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_meta_uuid))return false; }return true;
libxfs/xfs_format.h +20 -3
@@ -100,7 +100,7 @@ typedef struct xfs_sb {xfs_rfsblock_t sb_dblocks;/* number of data blocks */ xfs_rfsblock_t sb_rblocks;/* number of realtime blocks */ xfs_rtblock_t sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ xfs_fsblock_t sb_logstart;/* starting block of log if internal */ xfs_ino_t sb_rootino;/* root inode number */ xfs_ino_t sb_rbmino;/* bitmap inode for realtime extents */
@@ -174,6 +174,7 @@ typedef struct xfs_sb {xfs_ino_t sb_pquotino;/* project quota inode */ xfs_lsn_t sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_sb_t;
@@ -190,7 +191,7 @@ typedef struct xfs_dsb {__be64 sb_dblocks;/* number of data blocks */ __be64 sb_rblocks;/* number of realtime blocks */ __be64 sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ __be64 sb_logstart;/* starting block of log if internal */ __be64 sb_rootino;/* root inode number */ __be64 sb_rbmino;/* bitmap inode for realtime extents */
@@ -260,6 +261,7 @@ typedef struct xfs_dsb {__be64 sb_pquotino;/* project quota inode */ __be64 sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_dsb_t;
@@ -458,9 +460,12 @@ xfs_sb_has_ro_compat_feature(#define XFS_SB_FEAT_INCOMPAT_FTYPE (1 << 0)/* filetype in dirent */ #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1)/* sparse inode chunks */ +#define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2)/* metadata UUID */ +#define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ - XFS_SB_FEAT_INCOMPAT_SPINODES) + XFS_SB_FEAT_INCOMPAT_SPINODES| \ + XFS_SB_FEAT_INCOMPAT_META_UUID)#define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool
@@ -515,6 +520,18 @@ static inline bool xfs_sb_version_hassparseinodes(struct xfs_sb *sbp) }/* +* XFS_SB_FEAT_INCOMPAT_META_UUID indicates that the metadata UUID +* is stored separately from the user-visible UUID; this allows the +* user-visible UUID to be changed on V5 filesystems which have a +* filesystem UUID stamped into every piece of metadata. +*/ +static inline int xfs_sb_version_hasmetauuid (xfs_sb_t *sbp) +{ +return (XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ) && + (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_META_UUID ); +} + +/* * end of superblock version macros */
libxfs/xfs_ialloc.c +3 -2
@@ -333,7 +333,8 @@ xfs_ialloc_inode_init(if (version ==3 ) { free->di_ino =cpu_to_be64 (ino); ino++; -uuid_copy (&free->di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&free->di_uuid, + &mp->m_sb.sb_meta_uuid);xfs_dinode_calc_crc (mp, free); }else if (tp) {/* just log the inode core */
@@ -2495,7 +2496,7 @@ xfs_agi_verify(struct xfs_agi *agi =XFS_BUF_TO_AGI (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid))return false;/* * Validate the magic number of the agi block.
libxfs/xfs_ialloc_btree.c +1 -1
@@ -238,7 +238,7 @@ xfs_inobt_verify(case cpu_to_be32 (XFS_FIBT_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;
libxfs/xfs_inode_buf.c +2 -2
@@ -302,7 +302,7 @@ xfs_dinode_verify(return false;if (be64_to_cpu (dip->di_ino) != ino)return false; -if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_meta_uuid))return false;return true; }
@@ -364,7 +364,7 @@ xfs_iread(if (xfs_sb_version_hascrc (&mp->m_sb)) { ip->i_d.di_version =3 ; ip->i_d.di_ino = ip->i_ino; -uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); }else ip->i_d.di_version =2 ;return 0 ;
libxfs/xfs_sb.c +10 -0
@@ -381,6 +381,14 @@ __xfs_sb_from_disk( to->sb_spino_align =be32_to_cpu (from->sb_spino_align); to->sb_pquotino =be64_to_cpu (from->sb_pquotino); to->sb_lsn =be64_to_cpu (from->sb_lsn); +/* +* sb_meta_uuid is only on disk if it differs from sb_uuid and the +* feature flag is set; if not set we keep it only in memory. +*/ +if (xfs_sb_version_hasmetauuid (to)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); +else +uuid_copy (&to->sb_meta_uuid, &from->sb_uuid);/* Convert on-disk flags to in-memory flags? */ if (convert_xquota)xfs_sb_quota_from_disk (to);
@@ -522,6 +530,8 @@ xfs_sb_to_disk(cpu_to_be32 (from->sb_features_log_incompat); to->sb_spino_align =cpu_to_be32 (from->sb_spino_align); to->sb_lsn =cpu_to_be64 (from->sb_lsn); +if (xfs_sb_version_hasmetauuid (from)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); } }
libxfs/xfs_symlink_remote.c +2 -2
@@ -60,7 +60,7 @@ xfs_symlink_hdr_set( dsl->sl_magic =cpu_to_be32 (XFS_SYMLINK_MAGIC ); dsl->sl_offset =cpu_to_be32 (offset); dsl->sl_bytes =cpu_to_be32 (size); -uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid); dsl->sl_owner =cpu_to_be64 (ino); dsl->sl_blkno =cpu_to_be64 (bp->b_bn); bp->b_ops = &xfs_symlink_buf_ops;
@@ -104,7 +104,7 @@ xfs_symlink_verify(return false;if (dsl->sl_magic !=cpu_to_be32 (XFS_SYMLINK_MAGIC ))return false; -if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (bp->b_bn !=be64_to_cpu (dsl->sl_blkno))return false;
libxlog/util.c +4 -2
@@ -85,8 +85,10 @@ header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head) {char uu_log[64 ], uu_sb[64 ]; -if (print_skip_uuid)return 0 ; -if (!platform_uuid_compare (&mp->m_sb.sb_uuid, &head->h_fs_uuid))return 0 ; +if (print_skip_uuid) +return 0 ; +if (!platform_uuid_compare (&mp->m_sb.sb_uuid, &head->h_fs_uuid)) +return 0 ;platform_uuid_unparse (&mp->m_sb.sb_uuid, uu_sb);platform_uuid_unparse (&head->h_fs_uuid, uu_log);
man/man8/xfs_admin.8 +6 -1
@@ -102,7 +102,12 @@ The .I uuid may also be .BR generate , -which will generate a new UUID for the filesystem. +which will generate a new UUID for the filesystem. Note that on CRC-enabled +filesystems, this will set an incompatible flag such that older kernels will +not be able to mount the filesystem. To remove this incompatible flag, use +.BR restore , +which will restore the original UUID and remove the incompatible +feature flag as needed. .TP .B \-V Prints the version number and exits.
man/man8/xfs_db.8 +7 -2
@@ -664,7 +664,7 @@ The possible data types are: .BR sb ", " symlink " and " text . See the TYPES section below for more information on these data types. .TP -.BI "uuid [" uuid " | " generate " | " rewrite ] +.BI "uuid [" uuid " | " generate " | " rewrite " | " restore ] Set the filesystem universally unique identifier (UUID). The filesystem UUID can be used by .BR mount (8)
@@ -675,7 +675,12 @@ can be set directly to the desired UUID, or it can be automatically generated using the .B generate option. These options will both write the UUID into every copy of the -superblock in the filesystem. +superblock in the filesystem. On a CRC-enabled filesystem, this will +set an incompatible superblock flag, and the filesystem will not be +mountable with older kernels. This can be reverted with the +.B restore +option, which will copy the original UUID back into place and clear +the incompatible flag as needed. .B rewrite copies the current UUID from the primary superblock to all secondary copies of the superblock.
mkfs/xfs_mkfs.c +2 -0
@@ -2653,6 +2653,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), sbp->sb_rextents = rtextents;platform_uuid_generate (&uuid);platform_uuid_copy (&sbp->sb_uuid, &uuid); +/* Only in memory; libxfs expects this as if read from disk */ +platform_uuid_copy (&sbp->sb_meta_uuid, &uuid); sbp->sb_logstart = logstart; sbp->sb_rootino = sbp->sb_rbmino = sbp->sb_rsumino =NULLFSINO ; sbp->sb_rextsize = rtextblocks;
repair/agheader.c +12 -7
@@ -112,7 +112,7 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)if (!xfs_sb_version_hascrc (&mp->m_sb))return retval; -if (platform_uuid_compare (&agf->agf_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid)) {char uu[64 ]; retval =XR_AG_AGF ;
@@ -120,7 +120,8 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)do_warn (_ ("bad uuid %s for agf %d\n" ), uu, i);if (!no_modify) -platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agf->agf_uuid, + &mp->m_sb.sb_meta_uuid); }return retval; }
@@ -190,7 +191,7 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)if (!xfs_sb_version_hascrc (&mp->m_sb))return retval; -if (platform_uuid_compare (&agi->agi_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid)) {char uu[64 ]; retval =XR_AG_AGI ;
@@ -198,7 +199,8 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)do_warn (_ ("bad uuid %s for agi %d\n" ), uu, agno);if (!no_modify) -platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agi->agi_uuid, + &mp->m_sb.sb_meta_uuid); }return retval;
@@ -245,7 +247,7 @@ compare_sb(xfs_mount_t *mp, xfs_sb_t *sb)* superblocks, not just the secondary superblocks. */ static int -secondary_sb_wack( +secondary_sb_whack( struct xfs_mount *mp, struct xfs_buf *sbuf, struct xfs_sb *sb,
@@ -267,7 +269,10 @@ secondary_sb_wack(* * size is the size of data which is valid for this sb. */ -if (xfs_sb_version_hascrc (sb)) +if (xfs_sb_version_hasmetauuid (sb)) + size = offsetof(xfs_sb_t , sb_meta_uuid) + +sizeof (sb->sb_meta_uuid); +else if (xfs_sb_version_hascrc (sb)) size = offsetof(xfs_sb_t , sb_lsn) +sizeof (sb->sb_lsn);else if (xfs_sb_version_hasmorebits (sb))
@@ -511,7 +516,7 @@ verify_set_agheader(xfs_mount_t *mp, xfs_buf_t *sbuf, xfs_sb_t *sb, rval |=XR_AG_SB ; } - rval |=secondary_sb_wack (mp, sbuf, sb, i); + rval |=secondary_sb_whack (mp, sbuf, sb, i); rval |=verify_set_agf (mp, agf, i); rval |=verify_set_agi (mp, agi, i);
repair/agheader.h +0 -1
@@ -24,7 +24,6 @@ typedef struct fs_geometry {xfs_rfsblock_t sb_dblocks;/* # data blocks */ xfs_rfsblock_t sb_rblocks;/* # realtime blocks */ xfs_rtblock_t sb_rextents;/* # realtime extents */ -uuid_t sb_uuid;/* fs uuid */ xfs_fsblock_t sb_logstart;/* starting log block # */ xfs_agblock_t sb_rextsize;/* realtime extent size (blocks )*/ xfs_agblock_t sb_agblocks;/* # of blocks per ag */
repair/dinode.c +4 -3
@@ -207,9 +207,9 @@ clear_dinode_core(struct xfs_mount *mp, xfs_dinode_t *dinoc, xfs_ino_t ino_num) dinoc->di_ino =cpu_to_be64 (ino_num); } -if (platform_uuid_compare (&dinoc->di_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&dinoc->di_uuid, &mp->m_sb.sb_meta_uuid)) {__dirty_no_modify_ret (dirty); -platform_uuid_copy (&dinoc->di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&dinoc->di_uuid, &mp->m_sb.sb_meta_uuid); }for (i =0 ; i <sizeof (dinoc->di_pad2)/sizeof (dinoc->di_pad2[0 ]); i++) {
@@ -2287,7 +2287,8 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"),return 1 ; goto clear_bad_out; } -if (platform_uuid_compare (&dino->di_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&dino->di_uuid, + &mp->m_sb.sb_meta_uuid)) {if (!uncertain)do_warn (_ ("UUID mismatch on inode %" PRIu64"\n" ), lino);
repair/phase5.c +3 -3
@@ -1128,7 +1128,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, agi->agi_unlinked[i] =cpu_to_be32 (NULLAGINO );if (xfs_sb_version_hascrc (&mp->m_sb)) -platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid);if (xfs_sb_version_hasfinobt (&mp->m_sb)) { agi->agi_free_root =cpu_to_be32 (finobt_curs->root);
@@ -1406,7 +1406,7 @@ build_agf_agfl(xfs_mount_t *mp,#endif if (xfs_sb_version_hascrc (&mp->m_sb)) -platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid);/* initialise the AGFL, then fill it if there are blocks left over. */ agfl_buf = libxfs_getbuf(mp->m_dev,
@@ -1420,7 +1420,7 @@ build_agf_agfl(xfs_mount_t *mp,if (xfs_sb_version_hascrc (&mp->m_sb)) { agfl->agfl_magicnum =cpu_to_be32 (XFS_AGFL_MAGIC ); agfl->agfl_seqno =cpu_to_be32 (agno); -platform_uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid);for (i =0 ; i <XFS_AGFL_SIZE (mp); i++) agfl->agfl_bno[i] =cpu_to_be32 (NULLAGBLOCK ); }
repair/phase6.c +3 -3
@@ -527,7 +527,7 @@ mk_rbmino(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rbmino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);
@@ -783,7 +783,7 @@ mk_rsumino(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rsumino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);
@@ -897,7 +897,7 @@ mk_root_dir(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rootino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 2/3 V6] xfsprogs: Add new sb_meta_uuid field, update userspace tools to manipulate it
Quoted 11 lines · Eric Sandeen
This adds a new superblock field,
sb_meta_uuid. This allows us to change the use-visible UUID on crc-enabled filesytems from userspace if desired, by copying the existing UUID to the new location for metadata comparisons. If this is done, an incompat flag must be set to prevent older filesystems from mounting the filesystem, but the original UUID can be restored, and the incompat flag removed, with a newxfs_db/xfs_adminUUID command, "restore."Much of this patch mirrors the kernel patch in simply renaming the field used for metadata uuid comparison; other bits:
Quoted 7 lines
* Teach
xfs_dbto print the newmeta_uuidfield
* Allowxfs_dbto generate a new UUID for CRC-enabled filesystems
* Allowxfs_dbto revert to the original UUID and clear the flag
* Fix upxfs_copyto work with CRC-enabled filesystems
* Update thexfs_adminmanpage to show the UUID "restore" commandSigned-off-by Eric Sandeen <[email protected]>
Note, this was originally
Reviewed-by Brian Foster <[email protected]>
but has minor changes to address Dave's small issues, and is rebased against the current tree.
Thanks,
-Eric
Quoted 893 lines
---
copy/xfs_copy.c +32
-12@@ -25,6 +25,7 @@#include "xfs_copy.h" #define rounddown (x, y) (((x)/(y))*(y)) +#define uuid_equal (s,d) (platform_uuid_compare((s),(d)) == 0)extern int platform_check_ismounted (char *,char *,struct stat64 *,int );@@ -466,6 +467,36 @@ write_wbuf(void)sighold (SIGCHLD ); } +void +sb_update_uuid ( +xfs_sb_t *sb, +ag_header_t *ag_hdr, +thread_args *tcarg) +{ +/* +* If this filesystem has CRCs, the original UUID is stamped into +* all metadata. If we are changing the UUID in the copy, we need +* to copy the original UUID into the meta_uuid slot and set the +* set the incompat flag if that hasn't already been done. +*/ +if (!uuid_equal (&tcarg->uuid, &ag_hdr->xfs_sb->sb_uuid) && +xfs_sb_version_hascrc (sb) && !xfs_sb_version_hasmetauuid (sb)) { +__be32 feat; + + feat =be32_to_cpu (ag_hdr->xfs_sb->sb_features_incompat); + feat |=XFS_SB_FEAT_INCOMPAT_META_UUID ; + ag_hdr->xfs_sb->sb_features_incompat =cpu_to_be32 (feat); +platform_uuid_copy (&ag_hdr->xfs_sb->sb_meta_uuid, + &ag_hdr->xfs_sb->sb_uuid); + } + +platform_uuid_copy (&ag_hdr->xfs_sb->sb_uuid, &tcarg->uuid); + +/* We may have changed the UUID, so update the superblock CRC */ +if (xfs_sb_version_hascrc (sb)) +xfs_update_cksum ((char *)ag_hdr->xfs_sb, sb->sb_sectsize, +XFS_SB_CRC_OFF ); +}int main (int argc,char **argv)@@ -666,16 +697,6 @@ main(int argc, char **argv)1 << (sb->sb_sectlog -BBSHIFT ), 0, &xfs_sb_buf_ops); -/* -* For now, V5 superblock filesystems are not supported without -d; -* we do not have the infrastructure yet to fix CRCs when a new UUID -* is generated. -*/ -if (xfs_sb_version_hascrc (sb) && !duplicate) { -do_log (_ ("%s: Cannot yet copy V5 fs without '-d'\n" ), progname); -exit (1 ); - } - mp =libxfs_mount (&mbuf, sb, xargs.ddev, xargs.logdev, xargs.rtdev,0 );if (mp ==NULL ) { do_log(_("%s: %s filesystem failed to initialize\n"@@ -1134,8 +1155,7 @@ main(int argc, char **argv)/* do each thread in turn, each has its own UUID */ for (j =0 , tcarg = targ; j < num_targets; j++) { -platform_uuid_copy (&ag_hdr.xfs_sb->sb_uuid, - &tcarg->uuid); +sb_update_uuid (sb, &ag_hdr, tcarg);do_write (tcarg); tcarg++; }db/sb.c +42
-12@@ -29,6 +29,8 @@#include "output.h" #include "init.h" +#define uuid_equal (s,d) (platform_uuid_compare((s),(d)) == 0) +static int sb_f (int argc,char **argv);static void sb_help (void );static int uuid_f (int argc,char **argv);@@ -122,6 +124,7 @@ const field_t sb_flds[] = { { "spino_align", FLDT_EXTLEN, OI(OFF(spino_align)), C1, 0, TYP_NONE }, { "pquotino", FLDT_INO, OI(OFF(pquotino)), C1, 0, TYP_INODE }, { "lsn", FLDT_UINT64X, OI(OFF(lsn)), C1, 0, TYP_NONE }, + { "meta_uuid", FLDT_UUID, OI(OFF(meta_uuid)), C1, 0, TYP_NONE }, { NULL } };@@ -323,6 +326,32 @@ do_uuid(xfs_agnumber_t agno, uuid_t *uuid)return &uu; }/* set uuid */ +if (!xfs_sb_version_hascrc (&tsb)) + goto write; +/* +* If we have CRCs, and this UUID differs from that stamped in the +* metadata, set the incompat flag and copy the old one to the +* metadata-specific location. +* +* If we are setting the user-visible UUID back to match the metadata +* UUID, clear the metadata-specific location and the incompat flag. +*/ +if (!xfs_sb_version_hasmetauuid (&tsb) && + !uuid_equal (uuid, &mp->m_sb.sb_meta_uuid)) { + mp->m_sb.sb_features_incompat |=XFS_SB_FEAT_INCOMPAT_META_UUID ; + tsb.sb_features_incompat |=XFS_SB_FEAT_INCOMPAT_META_UUID ; +memcpy (&tsb.sb_meta_uuid, &tsb.sb_uuid,sizeof (uuid_t)); + }else if (xfs_sb_version_hasmetauuid (&tsb) && +uuid_equal (uuid, &mp->m_sb.sb_meta_uuid)) { +memset (&tsb.sb_meta_uuid,0 ,sizeof (uuid_t)); +/* Write those zeros now; it's ignored once we clear the flag */ +libxfs_sb_to_disk (iocur_top->data, &tsb); + mp->m_sb.sb_features_incompat &= + ~XFS_SB_FEAT_INCOMPAT_META_UUID ; + tsb.sb_features_incompat &= ~XFS_SB_FEAT_INCOMPAT_META_UUID ; + } + +write:memcpy (&tsb.sb_uuid, uuid,sizeof (uuid_t));libxfs_sb_to_disk (iocur_top->data, &tsb);write_cur ();@@ -352,18 +381,6 @@ uuid_f(return 0 ; } -/* -* For now, changing the UUID of V5 superblock filesystems is -* not supported; we do not have the infrastructure to fix all -* other metadata when a new superblock UUID is generated. -*/ -if (xfs_sb_version_hascrc (&mp->m_sb) && -strcasecmp (argv[1 ],"rewrite" )) { -dbprintf (_ ("%s: only 'rewrite' supported on V5 fs\n" ), - progname); -return 0 ; - } -if (!strcasecmp (argv[1 ],"generate" )) {platform_uuid_generate (&uu); }else if (!strcasecmp (argv[1 ],"nil" )) {@@ -377,6 +394,17 @@ uuid_f(memcpy (&uu, uup,sizeof (uuid_t));platform_uuid_unparse (&uu, bp);dbprintf (_ ("old UUID = %s\n" ), bp); + }else if (!strcasecmp (argv[1 ],"restore" )) { +xfs_sb_t tsb; + +if (!get_sb (0 , &tsb)) +return 0 ; + +/* Not set; nothing to do. Success! */ +if (!xfs_sb_version_hasmetauuid (&tsb)) +return 0 ; + +memcpy (&uu, mp->m_sb.sb_meta_uuid,sizeof (uuid_t)); }else {if (platform_uuid_parse (argv[1 ], &uu)) {dbprintf (_ ("invalid UUID\n" ));@@ -653,6 +681,8 @@ version_string(strcat (s,",FINOBT" );if (xfs_sb_version_hassparseinodes (sbp))strcat (s,",SPARSE_INODES" ); +if (xfs_sb_version_hasmetauuid (sbp)) +strcat (s,",META_UUID" );return s; }libxfs/xfs_alloc.c +2
-2@@ -460,7 +460,7 @@ xfs_agfl_verify(struct xfs_agfl *agfl =XFS_BUF_TO_AGFL (bp);int i; -if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be32_to_cpu (agfl->agfl_magicnum) !=XFS_AGFL_MAGIC )return false;@@ -2256,7 +2256,7 @@ xfs_agf_verify(struct xfs_agf *agf =XFS_BUF_TO_AGF (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))return false; if (!(agf->agf_magicnum == cpu_to_be32(XFS_AGF_MAGIC) &&libxfs/xfs_alloc_btree.c +2
-2@@ -293,7 +293,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTB_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;@@ -311,7 +311,7 @@ xfs_allocbt_verify(case cpu_to_be32 (XFS_ABTC_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;libxfs/xfs_attr_leaf.c +2
-2@@ -258,7 +258,7 @@ xfs_attr3_leaf_verify(if (ichdr.magic !=XFS_ATTR3_LEAF_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;@@ -1052,7 +1052,7 @@ xfs_attr3_leaf_create( hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); ichdr.freemap[0 ].base =sizeof (struct xfs_attr3_leaf_hdr ); }else {libxfs/xfs_attr_remote.c +2
-2@@ -95,7 +95,7 @@ xfs_attr3_rmt_verify(return false;if (rmt->rm_magic !=cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ))return false; -if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (rmt->rm_blkno) != bno)return false;@@ -212,7 +212,7 @@ xfs_attr3_rmt_hdr_set( rmt->rm_magic =cpu_to_be32 (XFS_ATTR3_RMT_MAGIC ); rmt->rm_offset =cpu_to_be32 (offset); rmt->rm_bytes =cpu_to_be32 (size); -uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&rmt->rm_uuid, &mp->m_sb.sb_meta_uuid); rmt->rm_owner =cpu_to_be64 (ino); rmt->rm_blkno =cpu_to_be64 (bno);libxfs/xfs_bmap_btree.c +3
-2@@ -346,7 +346,8 @@ xfs_bmbt_to_bmdr(if (xfs_sb_version_hascrc (&mp->m_sb)) {ASSERT (rblock->bb_magic ==cpu_to_be32 (XFS_BMAP_CRC_MAGIC )); -ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)); +ASSERT (uuid_equal (&rblock->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid));ASSERT (rblock->bb_u.l.bb_blkno ==cpu_to_be64 (XFS_BUF_DADDR_NULL )); }else @@ -644,7 +645,7 @@ xfs_bmbt_verify(case cpu_to_be32 (XFS_BMAP_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (block->bb_u.l.bb_blkno) != bp->b_bn)return false;libxfs/xfs_btree.c +6
-4@@ -62,7 +62,8 @@ xfs_btree_check_lblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { lblock_ok = lblock_ok && -uuid_equal (&block->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.l.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.l.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }@@ -112,7 +113,8 @@ xfs_btree_check_sblock(if (xfs_sb_version_hascrc (&mp->m_sb)) { sblock_ok = sblock_ok && -uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid) && +uuid_equal (&block->bb_u.s.bb_uuid, + &mp->m_sb.sb_meta_uuid) && block->bb_u.s.bb_blkno ==cpu_to_be64 ( bp ? bp->b_bn :XFS_BUF_DADDR_NULL ); }@@ -997,7 +999,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.l.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.l.bb_owner =cpu_to_be64 (owner); -uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.l.bb_pad =0 ; buf->bb_u.l.bb_lsn =0 ; }@@ -1010,7 +1012,7 @@ xfs_btree_init_block_int(if (flags &XFS_BTREE_CRC_BLOCKS ) { buf->bb_u.s.bb_blkno =cpu_to_be64 (blkno); buf->bb_u.s.bb_owner =cpu_to_be32 (__owner); -uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid); buf->bb_u.s.bb_lsn =0 ; } }libxfs/xfs_da_btree.c +2
-2@@ -142,7 +142,7 @@ xfs_da3_node_verify(if (ichdr.magic !=XFS_DA3_NODE_MAGIC )return false; -if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->info.blkno) != bp->b_bn)return false;@@ -320,7 +320,7 @@ xfs_da3_node_create( ichdr.magic =XFS_DA3_NODE_MAGIC ; hdr3->info.blkno =cpu_to_be64 (bp->b_bn); hdr3->info.owner =cpu_to_be64 (args->dp->i_ino); -uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->info.uuid, &mp->m_sb.sb_meta_uuid); }else { ichdr.magic =XFS_DA_NODE_MAGIC ; }libxfs/xfs_dir2_block.c +2
-2@@ -64,7 +64,7 @@ xfs_dir3_block_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;@@ -154,7 +154,7 @@ xfs_dir3_block_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_BLOCK_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid);return ; }libxfs/xfs_dir2_data.c +2
-2@@ -218,7 +218,7 @@ xfs_dir3_data_verify(if (xfs_sb_version_hascrc (&mp->m_sb)) {if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_DATA_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;@@ -602,7 +602,7 @@ xfs_dir3_data_init( hdr3->magic =cpu_to_be32 (XFS_DIR3_DATA_MAGIC ); hdr3->blkno =cpu_to_be64 (bp->b_bn); hdr3->owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->uuid, &mp->m_sb.sb_meta_uuid); }else hdr->magic =cpu_to_be32 (XFS_DIR2_DATA_MAGIC );libxfs/xfs_dir2_leaf.c +2
-2@@ -158,7 +158,7 @@ xfs_dir3_leaf_verify(if (leaf3->info.hdr.magic !=cpu_to_be16 (magic3))return false; -if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (leaf3->info.blkno) != bp->b_bn)return false;@@ -308,7 +308,7 @@ xfs_dir3_leaf_init( : cpu_to_be16(XFS_DIR3_LEAFN_MAGIC); leaf3->info.blkno =cpu_to_be64 (bp->b_bn); leaf3->info.owner =cpu_to_be64 (owner); -uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&leaf3->info.uuid, &mp->m_sb.sb_meta_uuid); }else {memset (leaf,0 ,sizeof (*leaf)); leaf->hdr.info.magic =cpu_to_be16 (type);libxfs/xfs_dir2_node.c +2
-2@@ -91,7 +91,7 @@ xfs_dir3_free_verify(if (hdr3->magic !=cpu_to_be32 (XFS_DIR3_FREE_MAGIC ))return false; -if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&hdr3->uuid, &mp->m_sb.sb_meta_uuid))return false;if (be64_to_cpu (hdr3->blkno) != bp->b_bn)return false;@@ -224,7 +224,7 @@ xfs_dir3_free_get_buf( hdr3->hdr.blkno =cpu_to_be64 (bp->b_bn); hdr3->hdr.owner =cpu_to_be64 (dp->i_ino); -uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_uuid); +uuid_copy (&hdr3->hdr.uuid, &mp->m_sb.sb_meta_uuid); }else hdr.magic =XFS_DIR2_FREE_MAGIC ; dp->d_ops->free_hdr_to_disk (bp->b_addr, &hdr);libxfs/xfs_dquot_buf.c +2
-2@@ -171,7 +171,7 @@ xfs_dqcheck( d->dd_diskdq.d_id =cpu_to_be32 (id);if (xfs_sb_version_hascrc (&mp->m_sb)) { -uuid_copy (&d->dd_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&d->dd_uuid, &mp->m_sb.sb_meta_uuid);xfs_update_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ); }@@ -206,7 +206,7 @@ xfs_dquot_buf_verify_crc(if (!xfs_verify_cksum ((char *)d,sizeof (struct xfs_dqblk ),XFS_DQUOT_CRC_OFF ))return false; -if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&d->dd_uuid, &mp->m_sb.sb_meta_uuid))return false; }return true;libxfs/xfs_format.h +20
-3@@ -100,7 +100,7 @@ typedef struct xfs_sb {xfs_rfsblock_t sb_dblocks;/* number of data blocks */ xfs_rfsblock_t sb_rblocks;/* number of realtime blocks */ xfs_rtblock_t sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ xfs_fsblock_t sb_logstart;/* starting block of log if internal */ xfs_ino_t sb_rootino;/* root inode number */ xfs_ino_t sb_rbmino;/* bitmap inode for realtime extents */ @@ -174,6 +174,7 @@ typedef struct xfs_sb {xfs_ino_t sb_pquotino;/* project quota inode */ xfs_lsn_t sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_sb_t;@@ -190,7 +191,7 @@ typedef struct xfs_dsb {__be64 sb_dblocks;/* number of data blocks */ __be64 sb_rblocks;/* number of realtime blocks */ __be64 sb_rextents;/* number of realtime extents */ -uuid_t sb_uuid;/* file system unique id */ +uuid_t sb_uuid;/* user-visible file system unique id */ __be64 sb_logstart;/* starting block of log if internal */ __be64 sb_rootino;/* root inode number */ __be64 sb_rbmino;/* bitmap inode for realtime extents */ @@ -260,6 +261,7 @@ typedef struct xfs_dsb {__be64 sb_pquotino;/* project quota inode */ __be64 sb_lsn;/* last write sequence */ +uuid_t sb_meta_uuid;/* metadata file system unique id */ /* must be padded to 64 bit alignment */ } xfs_dsb_t;@@ -458,9 +460,12 @@ xfs_sb_has_ro_compat_feature(#define XFS_SB_FEAT_INCOMPAT_FTYPE (1 << 0)/* filetype in dirent */ #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1)/* sparse inode chunks */ +#define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2)/* metadata UUID */ +#define XFS_SB_FEAT_INCOMPAT_ALL \ (XFS_SB_FEAT_INCOMPAT_FTYPE| \ - XFS_SB_FEAT_INCOMPAT_SPINODES) + XFS_SB_FEAT_INCOMPAT_SPINODES| \ + XFS_SB_FEAT_INCOMPAT_META_UUID)#define XFS_SB_FEAT_INCOMPAT_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_ALL static inline bool@@ -515,6 +520,18 @@ static inline bool xfs_sb_version_hassparseinodes(struct xfs_sb *sbp) }/* +* XFS_SB_FEAT_INCOMPAT_META_UUID indicates that the metadata UUID +* is stored separately from the user-visible UUID; this allows the +* user-visible UUID to be changed on V5 filesystems which have a +* filesystem UUID stamped into every piece of metadata. +*/ +static inline int xfs_sb_version_hasmetauuid (xfs_sb_t *sbp) +{ +return (XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 ) && + (sbp->sb_features_incompat &XFS_SB_FEAT_INCOMPAT_META_UUID ); +} + +/* * end of superblock version macros */ libxfs/xfs_ialloc.c +3
-2@@ -333,7 +333,8 @@ xfs_ialloc_inode_init(if (version ==3 ) { free->di_ino =cpu_to_be64 (ino); ino++; -uuid_copy (&free->di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&free->di_uuid, + &mp->m_sb.sb_meta_uuid);xfs_dinode_calc_crc (mp, free); }else if (tp) {/* just log the inode core */ @@ -2495,7 +2496,7 @@ xfs_agi_verify(struct xfs_agi *agi =XFS_BUF_TO_AGI (bp);if (xfs_sb_version_hascrc (&mp->m_sb) && - !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_uuid)) + !uuid_equal (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid))return false;/* * Validate the magic number of the agi block. libxfs/xfs_ialloc_btree.c +1
-1@@ -238,7 +238,7 @@ xfs_inobt_verify(case cpu_to_be32 (XFS_FIBT_CRC_MAGIC ):if (!xfs_sb_version_hascrc (&mp->m_sb))return false; -if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))return false;if (block->bb_u.s.bb_blkno !=cpu_to_be64 (bp->b_bn))return false;libxfs/xfs_inode_buf.c +2
-2@@ -302,7 +302,7 @@ xfs_dinode_verify(return false;if (be64_to_cpu (dip->di_ino) != ino)return false; -if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dip->di_uuid, &mp->m_sb.sb_meta_uuid))return false;return true; }@@ -364,7 +364,7 @@ xfs_iread(if (xfs_sb_version_hascrc (&mp->m_sb)) { ip->i_d.di_version =3 ; ip->i_d.di_ino = ip->i_ino; -uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); }else ip->i_d.di_version =2 ;return 0 ;libxfs/xfs_sb.c +10
-0@@ -381,6 +381,14 @@ __xfs_sb_from_disk( to->sb_spino_align =be32_to_cpu (from->sb_spino_align); to->sb_pquotino =be64_to_cpu (from->sb_pquotino); to->sb_lsn =be64_to_cpu (from->sb_lsn); +/* +* sb_meta_uuid is only on disk if it differs from sb_uuid and the +* feature flag is set; if not set we keep it only in memory. +*/ +if (xfs_sb_version_hasmetauuid (to)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); +else +uuid_copy (&to->sb_meta_uuid, &from->sb_uuid);/* Convert on-disk flags to in-memory flags? */ if (convert_xquota)xfs_sb_quota_from_disk (to);@@ -522,6 +530,8 @@ xfs_sb_to_disk(cpu_to_be32 (from->sb_features_log_incompat); to->sb_spino_align =cpu_to_be32 (from->sb_spino_align); to->sb_lsn =cpu_to_be64 (from->sb_lsn); +if (xfs_sb_version_hasmetauuid (from)) +uuid_copy (&to->sb_meta_uuid, &from->sb_meta_uuid); } }libxfs/xfs_symlink_remote.c +2
-2@@ -60,7 +60,7 @@ xfs_symlink_hdr_set( dsl->sl_magic =cpu_to_be32 (XFS_SYMLINK_MAGIC ); dsl->sl_offset =cpu_to_be32 (offset); dsl->sl_bytes =cpu_to_be32 (size); -uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_uuid); +uuid_copy (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid); dsl->sl_owner =cpu_to_be64 (ino); dsl->sl_blkno =cpu_to_be64 (bp->b_bn); bp->b_ops = &xfs_symlink_buf_ops;@@ -104,7 +104,7 @@ xfs_symlink_verify(return false;if (dsl->sl_magic !=cpu_to_be32 (XFS_SYMLINK_MAGIC ))return false; -if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_uuid)) +if (!uuid_equal (&dsl->sl_uuid, &mp->m_sb.sb_meta_uuid))return false;if (bp->b_bn !=be64_to_cpu (dsl->sl_blkno))return false;libxlog/util.c +4
-2@@ -85,8 +85,10 @@ header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head) {char uu_log[64 ], uu_sb[64 ]; -if (print_skip_uuid)return 0 ; -if (!platform_uuid_compare (&mp->m_sb.sb_uuid, &head->h_fs_uuid))return 0 ; +if (print_skip_uuid) +return 0 ; +if (!platform_uuid_compare (&mp->m_sb.sb_uuid, &head->h_fs_uuid)) +return 0 ;platform_uuid_unparse (&mp->m_sb.sb_uuid, uu_sb);platform_uuid_unparse (&head->h_fs_uuid, uu_log);man/man8/xfs_admin.8 +6
-1@@ -102,7 +102,12 @@ The .I uuid may also be .BR generate , -which will generate a new UUID for the filesystem. +which will generate a new UUID for the filesystem. Note that on CRC-enabled +filesystems, this will set an incompatible flag such that older kernels will +not be able to mount the filesystem. To remove this incompatible flag, use +.BR restore , +which will restore the original UUID and remove the incompatible +feature flag as needed. .TP .B \-V Prints the version number and exits.man/man8/xfs_db.8 +7
-2@@ -664,7 +664,7 @@ The possible data types are: .BR sb ", " symlink " and " text . See the TYPES section below for more information on these data types. .TP -.BI "uuid [" uuid " | " generate " | " rewrite ] +.BI "uuid [" uuid " | " generate " | " rewrite " | " restore ] Set the filesystem universally unique identifier (UUID). The filesystem UUID can be used by .BR mount (8)@@ -675,7 +675,12 @@ can be set directly to the desired UUID, or it can be automatically generated using the .B generate option. These options will both write the UUID into every copy of the -superblock in the filesystem. +superblock in the filesystem. On a CRC-enabled filesystem, this will +set an incompatible superblock flag, and the filesystem will not be +mountable with older kernels. This can be reverted with the +.B restore +option, which will copy the original UUID back into place and clear +the incompatible flag as needed. .B rewrite copies the current UUID from the primary superblock to all secondary copies of the superblock.mkfs/xfs_mkfs.c +2
-0@@ -2653,6 +2653,8 @@ _("size %s specified for log subvolume is too large, maximum is %lld blocks\n"), sbp->sb_rextents = rtextents;platform_uuid_generate (&uuid);platform_uuid_copy (&sbp->sb_uuid, &uuid); +/* Only in memory; libxfs expects this as if read from disk */ +platform_uuid_copy (&sbp->sb_meta_uuid, &uuid); sbp->sb_logstart = logstart; sbp->sb_rootino = sbp->sb_rbmino = sbp->sb_rsumino =NULLFSINO ; sbp->sb_rextsize = rtextblocks;repair/agheader.c +12
-7@@ -112,7 +112,7 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)if (!xfs_sb_version_hascrc (&mp->m_sb))return retval; -if (platform_uuid_compare (&agf->agf_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid)) {char uu[64 ]; retval =XR_AG_AGF ;@@ -120,7 +120,8 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)do_warn (_ ("bad uuid %s for agf %d\n" ), uu, i);if (!no_modify) -platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agf->agf_uuid, + &mp->m_sb.sb_meta_uuid); }return retval; }@@ -190,7 +191,7 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)if (!xfs_sb_version_hascrc (&mp->m_sb))return retval; -if (platform_uuid_compare (&agi->agi_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid)) {char uu[64 ]; retval =XR_AG_AGI ;@@ -198,7 +199,8 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)do_warn (_ ("bad uuid %s for agi %d\n" ), uu, agno);if (!no_modify) -platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agi->agi_uuid, + &mp->m_sb.sb_meta_uuid); }return retval;@@ -245,7 +247,7 @@ compare_sb(xfs_mount_t *mp, xfs_sb_t *sb)* superblocks, not just the secondary superblocks. */ static int -secondary_sb_wack( +secondary_sb_whack( struct xfs_mount *mp, struct xfs_buf *sbuf, struct xfs_sb *sb,@@ -267,7 +269,10 @@ secondary_sb_wack(* * size is the size of data which is valid for this sb. */ -if (xfs_sb_version_hascrc (sb)) +if (xfs_sb_version_hasmetauuid (sb)) + size = offsetof(xfs_sb_t , sb_meta_uuid) + +sizeof (sb->sb_meta_uuid); +else if (xfs_sb_version_hascrc (sb)) size = offsetof(xfs_sb_t , sb_lsn) +sizeof (sb->sb_lsn);else if (xfs_sb_version_hasmorebits (sb))@@ -511,7 +516,7 @@ verify_set_agheader(xfs_mount_t *mp, xfs_buf_t *sbuf, xfs_sb_t *sb, rval |=XR_AG_SB ; } - rval |=secondary_sb_wack (mp, sbuf, sb, i); + rval |=secondary_sb_whack (mp, sbuf, sb, i); rval |=verify_set_agf (mp, agf, i); rval |=verify_set_agi (mp, agi, i);repair/agheader.h +0
-1@@ -24,7 +24,6 @@ typedef struct fs_geometry {xfs_rfsblock_t sb_dblocks;/* # data blocks */ xfs_rfsblock_t sb_rblocks;/* # realtime blocks */ xfs_rtblock_t sb_rextents;/* # realtime extents */ -uuid_t sb_uuid;/* fs uuid */ xfs_fsblock_t sb_logstart;/* starting log block # */ xfs_agblock_t sb_rextsize;/* realtime extent size (blocks )*/ xfs_agblock_t sb_agblocks;/* # of blocks per ag */ repair/dinode.c +4
-3@@ -207,9 +207,9 @@ clear_dinode_core(struct xfs_mount *mp, xfs_dinode_t *dinoc, xfs_ino_t ino_num) dinoc->di_ino =cpu_to_be64 (ino_num); } -if (platform_uuid_compare (&dinoc->di_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&dinoc->di_uuid, &mp->m_sb.sb_meta_uuid)) {__dirty_no_modify_ret (dirty); -platform_uuid_copy (&dinoc->di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&dinoc->di_uuid, &mp->m_sb.sb_meta_uuid); }for (i =0 ; i <sizeof (dinoc->di_pad2)/sizeof (dinoc->di_pad2[0 ]); i++) {@@ -2287,7 +2287,8 @@ _("inode identifier %llu mismatch on inode %" PRIu64 "\n"),return 1 ; goto clear_bad_out; } -if (platform_uuid_compare (&dino->di_uuid, &mp->m_sb.sb_uuid)) { +if (platform_uuid_compare (&dino->di_uuid, + &mp->m_sb.sb_meta_uuid)) {if (!uncertain)do_warn (_ ("UUID mismatch on inode %" PRIu64"\n" ), lino);repair/phase5.c +3
-3@@ -1128,7 +1128,7 @@ build_agi(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, agi->agi_unlinked[i] =cpu_to_be32 (NULLAGINO );if (xfs_sb_version_hascrc (&mp->m_sb)) -platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agi->agi_uuid, &mp->m_sb.sb_meta_uuid);if (xfs_sb_version_hasfinobt (&mp->m_sb)) { agi->agi_free_root =cpu_to_be32 (finobt_curs->root);@@ -1406,7 +1406,7 @@ build_agf_agfl(xfs_mount_t *mp,#endif if (xfs_sb_version_hascrc (&mp->m_sb)) -platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agf->agf_uuid, &mp->m_sb.sb_meta_uuid);/* initialise the AGFL, then fill it if there are blocks left over. */ agfl_buf = libxfs_getbuf(mp->m_dev,@@ -1420,7 +1420,7 @@ build_agf_agfl(xfs_mount_t *mp,if (xfs_sb_version_hascrc (&mp->m_sb)) { agfl->agfl_magicnum =cpu_to_be32 (XFS_AGFL_MAGIC ); agfl->agfl_seqno =cpu_to_be32 (agno); -platform_uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid);for (i =0 ; i <XFS_AGFL_SIZE (mp); i++) agfl->agfl_bno[i] =cpu_to_be32 (NULLAGBLOCK ); }repair/phase6.c +3
-3@@ -527,7 +527,7 @@ mk_rbmino(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rbmino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);@@ -783,7 +783,7 @@ mk_rsumino(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rsumino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);@@ -897,7 +897,7 @@ mk_root_dir(xfs_mount_t *mp) ip->i_d.di_flags2 =0 ; ip->i_d.di_ino = mp->m_sb.sb_rootino;memset (&(ip->i_d.di_pad2[0 ]),0 ,sizeof (ip->i_d.di_pad2)); -platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_uuid); +platform_uuid_copy (&ip->i_d.di_uuid, &mp->m_sb.sb_meta_uuid); times |=XFS_ICHGTIME_CREATE ; }libxfs_trans_ichgtime (tp, ip, times);
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH 3/3 V6] xfs: test changing UUID on V5 superblock
In reply to Eric SandeenTests xfs_db's ability to change & restore UUIDs on V5 filesystems, and tests xfs_copy's ability to change the UUID on the copy.
Update to _filter_uuid is so that it will catch the UUID output from xfs_admin -u, which is slightly different than the regexp it was expecting.
This requires new userspace which knows how to change the UUID on a V5 superblock.
Signed-off-by Eric Sandeen <[email protected]>
---
V6: Take into account Brian's prior review.
common/filter +2 -2
@@ -275,9 +275,9 @@ _filter_uuid() { if [ ! -z $1 ]; then UUID=$1 - sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i" + sed -e "s/\(uuid[ :=]\+\) $UUID/\1 <EXACTUUID>/i" else - sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i" + sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/ig" fi }
common/rc +15 -0
@@ -2702,6 +2702,21 @@ _require_test_fcntl_advisory_locks() _notrun "Require fcntl advisory locks support" } +# XFS ability to change UUIDs on V5/CRC filesystems +# +_require_meta_uuid() +{ + # This will create a crc fs on $SCRATCH_DEV + _require_xfs_crc + + $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1 \ + || _notrun "Userspace doesn't support meta_uuid feature" + + _scratch_mount >/dev/null 2>&1 \ + || _notrun "Kernel doesn't support meta_uuid feature" + umount $SCRATCH_MNT +} + _get_total_inode() { if [ -z "$1" ]; then
tests/xfs/074 new file +143 -0
143 lines not on this page · raw message
tests/xfs/074.out new file +21 -0
@@ -0,0 +1,21 @@ +QA output created by 074 +== Generate new UUID +Clearing log and setting UUID +writing all SBs +new UUID = <UUID> +== Rewrite UUID +old UUID = <EXACTUUID> +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== Restore old UUID +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== Rewrite UUID +old UUID = <EXACTUUID> +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== xfs_copy with new UUID +== xfs_copy with duplicate UUID
tests/xfs/group +1 -0
@@ -71,6 +71,7 @@ 071 rw auto 072 rw auto prealloc quick 073 copy auto +074 auto quick copy 078 growfs auto quick 080 rw ioctl 081 deprecated # log logprint quota
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Brian Foster
Reviewed-byRe: PATCH 3/3 V6] xfs: test changing UUID on V5 superblock
Quoted 152 lines · Eric Sandeen
Tests xfs_db's ability to change & restore UUIDs on V5 filesystems, and tests xfs_copy's ability to change the UUID on the copy.
Update to
_filter_uuidis so that it will catch the UUID output fromxfs_admin-u, which is slightly different than the regexp it was expecting.This requires new userspace which knows how to change the UUID on a V5 superblock.
Signed-off-by Eric Sandeen <[email protected]>---
V6: Take into account Brian's prior review.
common/filter +2
-2@@ -275,9 +275,9 @@ _filter_uuid() { if [ ! -z $1 ]; then UUID=$1 - sed -e "s/\(uuid:\) $UUID/\1 <EXACTUUID>/i" + sed -e "s/\(uuid[ :=]\+\) $UUID/\1 <EXACTUUID>/i" else - sed -e "s/\(uuid:\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/i" + sed -e "s/\(uuid[ :=]\+\) *[0-9a-f-][0-9a-f-]*/\1 <UUID>/ig" fi }common/rc +15
-0@@ -2702,6 +2702,21 @@ _require_test_fcntl_advisory_locks() _notrun "Require fcntl advisory locks support" } +# XFS ability to change UUIDs on V5/CRC filesystems +# +_require_meta_uuid() +{ + # This will create a crc fs on $SCRATCH_DEV + _require_xfs_crc + + $XFS_DB_PROG -x -c "uuid generate" $SCRATCH_DEV >/dev/null 2>&1 \ + || _notrun "Userspace doesn't support meta_uuid feature" + + _scratch_mount >/dev/null 2>&1 \ + || _notrun "Kernel doesn't support meta_uuid feature" + umount $SCRATCH_MNT +} + _get_total_inode() { if [ -z "$1" ]; thentests/xfs/074 new file +89
-0@@ -0,0 +1,143 @@ +#! /bin/bash +# FS QA Test 074 +# +# test UUID modification of CRC-enabled filesystems +# +# CRC-enabled / V5 superblock filesystems have a UUID stamped into +# every piece of metadata, and a mechanism was added later to allow +# changing the user-visible UUID by copying the original UUID (which +# matches all the existing metadata) to a new superblock location. +# Exercise some of that behavior. +# +#----------------------------------------------------------------------- +# Copyright (c) 2015 Red Hat, Inc. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +#----------------------------------------------------------------------- +# + +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# real QA test starts here + +_supported_fs xfs +_supported_os Linux +_require_scratch +_require_xfs_crc +_require_meta_uuid + +# Takes 2 args, 2nd optional: +# 1: generate, rewrite, or restore +# 2: Expected UUID after the action. Blank if new uuid generated +# After the action check the fs, and make sure it can be mounted +# Sets NEW_UUID to the resulting UUID. +_test_uuid() +{ + ACTION=$1 + EXPECTED_UUID=$2 + + $XFS_DB_PROG -x -c "uuid $ACTION" $SCRATCH_DEV \ + | _filter_uuid $EXPECTED_UUID + NEW_UUID=`$XFS_DB_PROG -c "uuid" $SCRATCH_DEV | awk '{print $NF}'` + _check_scratch_fs + _scratch_mount || _fail "Mount failed after UUID $ACTION" + _scratch_unmount + +} + +_fs_has_META_UUID() +{ + FS=$1 + $XFS_DB_PROG -r -c version $FS | grep -q META_UUID +} + +rm -f $seqres.full + +_scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed" + +ORIG_UUID=`$XFS_DB_PROG -c "uuid" $SCRATCH_DEV | awk '{print $NF}'` + +_scratch_mount +# Put some stuff on the fs
tests/xfs/074 line 99
Quoted 10 lines
tests/xfs/074 new file +10
-0+$FSSTRESS_PROG -d $SCRATCH_MNT -n 100 -p 4 >> $seqres.full 2>&1 +_scratch_unmount + +# Can xfs_db change it? + +echo "== Generate new UUID" +_test_uuid generate +[ "$NEW_UUID" == "$ORIG_UUID" ] && _fail "Failed to change UUID" +_fs_has_META_UUID $SCRATCH_DEV || _fail "META_UUID feature not set" +
FWIW, another cleanup here might be to add a "has_meta_uuid" param to _test_uuid that provides the expected _fs_has_META_UUID value following the operation. That would condense some of the repeated error messages. Otherwise this seems Ok to me:
Reviewed-by Brian Foster <[email protected]>
Quoted 88 lines
tests/xfs/074 new file +44
-0+# This should be a no-op +echo "== Rewrite UUID" +_test_uuid rewrite $NEW_UUID +_fs_has_META_UUID $SCRATCH_DEV || _fail "META_UUID feature not set" + +# Can we change it back? +echo "== Restore old UUID" +_test_uuid restore $ORIG_UUID +[ "$NEW_UUID" != "$ORIG_UUID" ] && _fail "Failed to restore UUID" +_fs_has_META_UUID $SCRATCH_DEV && _fail "META_UUID feature should not be not set" + +# This should be a no-op too. +echo "== Rewrite UUID" +_test_uuid rewrite $ORIG_UUID +_fs_has_META_UUID $SCRATCH_DEV && _fail "META_UUID feature should not be not set" + +# Ok, now what does xfs_copy do; it changes UUID by default + +IMGFILE=$TEST_DIR/$seq.copy.img +rm -f $IMGFILE + +# xfs_copy changes the UUID by default +echo "== xfs_copy with new UUID" +$XFS_COPY_PROG $SCRATCH_DEV $IMGFILE 2>&1 >> $seqres.full || \ + _fail "xfs_copy (new UUID) failed" +_check_xfs_filesystem $IMGFILE none none || _fail "Copy looks corrupted" +# The copy should have META_UUID feature set +_fs_has_META_UUID $IMGFILE || _fail "META_UUID feature not set on copy" +_scratch_mount || _fail "Mount failed after UUID rewrite" +_scratch_unmount + +rm -f $IMGFILE + +# duplicating the UUID should be fine too +echo "== xfs_copy with duplicate UUID" +$XFS_COPY_PROG -d $SCRATCH_DEV $IMGFILE 2>&1 >> $seqres.full || \ + _fail "xfs_copy (duplicate) failed" +_check_xfs_filesystem $IMGFILE none none || _fail "Duplicate copy looks corrupted" +# The copy should not have META_UUID feature set +_fs_has_META_UUID $IMGFILE && _fail "META_UUID feature should not be set on copy" + +# success, all done +status=0 +exittests/xfs/074.out new file +21
-0@@ -0,0 +1,21 @@ +QA output created by 074 +== Generate new UUID +Clearing log and setting UUID +writing all SBs +new UUID = <UUID> +== Rewrite UUID +old UUID = <EXACTUUID> +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== Restore old UUID +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== Rewrite UUID +old UUID = <EXACTUUID> +Clearing log and setting UUID +writing all SBs +new UUID = <EXACTUUID> +== xfs_copy with new UUID +== xfs_copy with duplicate UUIDtests/xfs/group +1
-0@@ -71,6 +71,7 @@ 071 rw auto 072 rw auto prealloc quick 073 copy auto +074 auto quick copy 078 growfs auto quick 080 rw ioctl 081 deprecated # log logprint quota_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs