xfs: mask off the rtbitmap and summary inodes when metadir in use

Set the rtbitmap and summary file inumbers to NULLFSINO in the
superblock and make sure they're zeroed whenever we write the superblock
to disk, to mimic mkfs behavior.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_sb.c b/fs/xfs/libxfs/xfs_sb.c
index 41c23c7881dda9f6457f7bf4dc9a204f14055498..5487a3b074dd61fdae21f237e44e722739ca6292 100644 (file)
--- a/fs/xfs/libxfs/xfs_sb.c
+++ b/fs/xfs/libxfs/xfs_sb.c
@@ -656,6 +656,13 @@ xfs_validate_sb_common(
 void
 xfs_sb_quota_from_disk(struct xfs_sb *sbp)
 {
+       if (xfs_sb_version_hasmetadir(sbp)) {
+               sbp->sb_uquotino = NULLFSINO;
+               sbp->sb_gquotino = NULLFSINO;
+               sbp->sb_pquotino = NULLFSINO;
+               return;
+       }
+
        /*
         * older mkfs doesn't initialize quota inodes to NULLFSINO. This
         * leads to in-core values having two different values for a quota
@@ -784,6 +791,8 @@ __xfs_sb_from_disk(
                to->sb_metadirino = be64_to_cpu(from->sb_metadirino);
                to->sb_rgcount = be32_to_cpu(from->sb_rgcount);
                to->sb_rgextents = be32_to_cpu(from->sb_rgextents);
+               to->sb_rbmino = NULLFSINO;
+               to->sb_rsumino = NULLFSINO;
        } else {
                to->sb_metadirino = NULLFSINO;
                to->sb_rgcount = 1;
@@ -806,6 +815,13 @@ xfs_sb_quota_to_disk(
 {
        uint16_t        qflags = from->sb_qflags;
 
+       if (xfs_sb_version_hasmetadir(from)) {
+               to->sb_uquotino = cpu_to_be64(0);
+               to->sb_gquotino = cpu_to_be64(0);
+               to->sb_pquotino = cpu_to_be64(0);
+               return;
+       }
+
        to->sb_uquotino = cpu_to_be64(from->sb_uquotino);
 
        /*
@@ -941,6 +957,8 @@ xfs_sb_to_disk(
                to->sb_metadirino = cpu_to_be64(from->sb_metadirino);
                to->sb_rgcount = cpu_to_be32(from->sb_rgcount);
                to->sb_rgextents = cpu_to_be32(from->sb_rgextents);
+               to->sb_rbmino = cpu_to_be64(0);
+               to->sb_rsumino = cpu_to_be64(0);
        }
 }