gfs2: Add rindex fields to rgrp headers

Add rg_data0, rg_data and rg_bitbytes to struct gfs2_rgrp. The fields
are identical to their counterparts in struct gfs2_rindex and are
intended to reduce the use of the rindex. For now the fields are only
written back as the in-memory equivalents in struct gfs2_rgrpd are set
using values from the rindex. However, they are needed at this point so
that userspace can make use of them, allowing a migration away from the
rindex over time.

The new fields take up previously reserved space which was explicitly
zeroed on write so, in clusters with mixed kernels, these fields could
get zeroed after being set and this should not be treated as an error.

Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>

diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index be2fc26029e4548e7e16063e30a6777249e675af..a9184903a9f5bc87affeac3e691ebcbfac24fcf2 100644 (file)
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1040,6 +1040,7 @@ static void gfs2_rgrp_in(struct gfs2_rgrpd *rgd, const void *buf)
        rgd->rd_free = be32_to_cpu(str->rg_free);
        rgd->rd_dinodes = be32_to_cpu(str->rg_dinodes);
        rgd->rd_igeneration = be64_to_cpu(str->rg_igeneration);
+       /* rd_data0, rd_data and rd_bitbytes already set from rindex */
 }
 
 static void gfs2_rgrp_out(struct gfs2_rgrpd *rgd, void *buf)
@@ -1055,6 +1056,10 @@ static void gfs2_rgrp_out(struct gfs2_rgrpd *rgd, void *buf)
        else if (next->rd_addr > rgd->rd_addr)
                str->rg_skip = cpu_to_be32(next->rd_addr - rgd->rd_addr);
        str->rg_igeneration = cpu_to_be64(rgd->rd_igeneration);
+       str->rg_data0 = cpu_to_be64(rgd->rd_data0);
+       str->rg_data = cpu_to_be32(rgd->rd_data);
+       str->rg_bitbytes = cpu_to_be32(rgd->rd_bitbytes);
+
        memset(&str->rg_reserved, 0, sizeof(str->rg_reserved));
 }
 

diff --git a/include/uapi/linux/gfs2_ondisk.h b/include/uapi/linux/gfs2_ondisk.h
index da7a30ddef7221f336a0e942b1a4ee645c6df975..648e0cbca574abd71811c2cb91cb93960ed9d361 100644 (file)
--- a/include/uapi/linux/gfs2_ondisk.h
+++ b/include/uapi/linux/gfs2_ondisk.h
@@ -192,8 +192,13 @@ struct gfs2_rgrp {
                __be32 rg_skip; /* Distance to the next rgrp in fs blocks */
        };
        __be64 rg_igeneration;
+       /* The following 3 fields are duplicated from gfs2_rindex to reduce
+          reliance on the rindex */
+       __be64 rg_data0;     /* First data location */
+       __be32 rg_data;      /* Number of data blocks in rgrp */
+       __be32 rg_bitbytes;  /* Number of bytes in data bitmaps */
 
-       __u8 rg_reserved[80]; /* Several fields from gfs1 now reserved */
+       __u8 rg_reserved[64]; /* Several fields from gfs1 now reserved */
 };
 
 /*