Blob Blame History Raw
commit f1969cd08d656377527455903d90431889c48211
Author: Andrew Price <anprice@redhat.com>
Date:   Wed May 9 17:59:32 2018 +0100

    libgfs2: Use sizeof for 'reserved' fields in ondisk.c
    
    Signed-off-by: Andrew Price <anprice@redhat.com>

diff --git a/gfs2/libgfs2/ondisk.c b/gfs2/libgfs2/ondisk.c
index 66de2234..bf3c6638 100644
--- a/gfs2/libgfs2/ondisk.c
+++ b/gfs2/libgfs2/ondisk.c
@@ -189,7 +189,7 @@ void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
 	CPIN_64(ri, str, ri_data0);
 	CPIN_32(ri, str, ri_data);
 	CPIN_32(ri, str, ri_bitbytes);
-	CPIN_08(ri, str, ri_reserved, 64);
+	CPIN_08(ri, str, ri_reserved, sizeof(ri->ri_reserved));
 }
 
 void gfs2_rindex_out(const struct gfs2_rindex *ri, char *buf)
@@ -205,7 +205,7 @@ void gfs2_rindex_out(const struct gfs2_rindex *ri, char *buf)
 
 	CPOUT_32(ri, str, ri_bitbytes);
 
-	CPOUT_08(ri, str, ri_reserved, 64);
+	CPOUT_08(ri, str, ri_reserved, sizeof(ri->ri_reserved));
 }
 
 void gfs2_rindex_print(const struct gfs2_rindex *ri)
@@ -228,7 +228,7 @@ void gfs2_rgrp_in(struct gfs2_rgrp *rg, struct gfs2_buffer_head *bh)
 	CPIN_32(rg, str, rg_free);
 	CPIN_32(rg, str, rg_dinodes);
 
-	CPIN_08(rg, str, rg_reserved, 80);
+	CPIN_08(rg, str, rg_reserved, sizeof(rg->rg_reserved));
 }
 
 void gfs2_rgrp_out(const struct gfs2_rgrp *rg, char *buf)
@@ -240,7 +240,7 @@ void gfs2_rgrp_out(const struct gfs2_rgrp *rg, char *buf)
 	CPOUT_32(rg, str, rg_free);
 	CPOUT_32(rg, str, rg_dinodes);
 
-	CPOUT_08(rg, str, rg_reserved, 80);
+	CPOUT_08(rg, str, rg_reserved, sizeof(rg->rg_reserved));
 }
 
 void gfs2_rgrp_out_bh(const struct gfs2_rgrp *rg, struct gfs2_buffer_head *bh)