From 6610c7bbce625746511671d9fe81786ae0c656ed Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 13 May 2013 09:45:01 -0400 Subject: [PATCH] --- yaml --- r: 375582 b: refs/heads/master c: e2555fde4159467fb579e6ae3c0a8fc33015d0f5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/journal-head.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2771ea36b0f1..15911639b411 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a549984b8c95acbecefd1fdd4bfdbea4d29b0588 +refs/heads/master: e2555fde4159467fb579e6ae3c0a8fc33015d0f5 diff --git a/trunk/include/linux/journal-head.h b/trunk/include/linux/journal-head.h index 13a3da25ff07..98cd41bb39c8 100644 --- a/trunk/include/linux/journal-head.h +++ b/trunk/include/linux/journal-head.h @@ -30,15 +30,19 @@ struct journal_head { /* * Journalling list for this buffer [jbd_lock_bh_state()] + * NOTE: We *cannot* combine this with b_modified into a bitfield + * as gcc would then (which the C standard allows but which is + * very unuseful) make 64-bit accesses to the bitfield and clobber + * b_jcount if its update races with bitfield modification. */ - unsigned b_jlist:4; + unsigned b_jlist; /* * This flag signals the buffer has been modified by * the currently running transaction * [jbd_lock_bh_state()] */ - unsigned b_modified:1; + unsigned b_modified; /* * Copy of the buffer data frozen for writing to the log.