diff options
| author | Jan Kara <jack@suse.cz> | 2011-05-05 13:59:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-23 15:28:34 -0700 |
| commit | d60d3e608149ff8c88070c97f86970d0c1033e5c (patch) | |
| tree | e8f8ab5f1a1add0b6d6dcac47a7474a8625ab426 /fs/jbd/commit.c | |
| parent | c7fec4fa64fc57805d0ba79bf57487b0ab7cac49 (diff) | |
| download | kernel-common-d60d3e608149ff8c88070c97f86970d0c1033e5c.tar.gz kernel-common-d60d3e608149ff8c88070c97f86970d0c1033e5c.tar.bz2 kernel-common-d60d3e608149ff8c88070c97f86970d0c1033e5c.zip | |
jbd: Fix forever sleeping process in do_get_write_access()
commit 2842bb20eed2e25cde5114298edc62c8883a1d9a upstream.
In do_get_write_access() we wait on BH_Unshadow bit for buffer to get
from shadow state. The waking code in journal_commit_transaction() has
a bug because it does not issue a memory barrier after the buffer is moved
from the shadow state and before wake_up_bit() is called. Thus a waitqueue
check can happen before the buffer is actually moved from the shadow state
and waiting process may never be woken. Fix the problem by issuing proper
barrier.
Reported-by: Tao Ma <boyu.mt@taobao.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 4bd882548c45..17d29a83f3ed 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -746,8 +746,13 @@ wait_for_iobuf: required. */ JBUFFER_TRACE(jh, "file as BJ_Forget"); journal_file_buffer(jh, commit_transaction, BJ_Forget); - /* Wake up any transactions which were waiting for this - IO to complete */ + /* + * Wake up any transactions which were waiting for this + * IO to complete. The barrier must be here so that changes + * by journal_file_buffer() take effect before wake_up_bit() + * does the waitqueue check. + */ + smp_mb(); wake_up_bit(&bh->b_state, BH_Unshadow); JBUFFER_TRACE(jh, "brelse shadowed buffer"); __brelse(bh); |