From: Steven Whitehouse Date: Fri, 21 Feb 2014 11:52:00 +0000 (+0000) Subject: GFS2: Reduce struct gfs2_trans in size X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=654a6d2f962edb7bf85973cfe93a04e24f56f902;p=linux-beck.git 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 --- diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index cf0e34400f71..645655cccdc8 100644 --- 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 2b20d7046bf3..963b28c50fd4 100644 --- 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,