GFS2: Reduce struct gfs2_trans in size

A couple of "int" fields were being used as boolean values
so we can make them bitfields of one bit, and put them in
what might otherwise be a hole in the structure with 64
bit alignment.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index cf0e34400f71e5588ffb476fa3f4667012e218f9..645655cccdc8ef34f960e26aebb782547658d88c 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -462,11 +462,11 @@ struct gfs2_trans {
        unsigned int tr_blocks;
        unsigned int tr_revokes;
        unsigned int tr_reserved;
+       unsigned int tr_touched:1;
+       unsigned int tr_attached:1;
 
        struct gfs2_holder tr_t_gh;
 
-       int tr_touched;
-       int tr_attached;
 
        unsigned int tr_num_buf_new;
        unsigned int tr_num_databuf_new;

diff --git a/fs/gfs2/trans.c b/fs/gfs2/trans.c
index 2b20d7046bf353ff58381821d1fea363010f3716..963b28c50fd423f80d3ef218270b7f0f45fb178c 100644 (file)
--- a/fs/gfs2/trans.c
+++ b/fs/gfs2/trans.c
@@ -98,7 +98,7 @@ static void gfs2_print_trans(const struct gfs2_trans *tr)
 {
        printk(KERN_WARNING "GFS2: Transaction created at: %pSR\n",
               (void *)tr->tr_ip);
-       printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%d\n",
+       printk(KERN_WARNING "GFS2: blocks=%u revokes=%u reserved=%u touched=%u\n",
               tr->tr_blocks, tr->tr_revokes, tr->tr_reserved, tr->tr_touched);
        printk(KERN_WARNING "GFS2: Buf %u/%u Databuf %u/%u Revoke %u/%u\n",
               tr->tr_num_buf_new, tr->tr_num_buf_rm,