diff --git a/[refs] b/[refs] index bec93bed08c2..4d7af94ef4cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c5eface5d0e4eb7f77be346193c2850e7e3b983 +refs/heads/master: 6e3647acb4f200add1d8e0203514f7ac925ae463 diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c index 5cd600baf8cf..ffb7f50abc2f 100644 --- a/trunk/fs/reiserfs/journal.c +++ b/trunk/fs/reiserfs/journal.c @@ -1120,8 +1120,11 @@ static int flush_commit_list(struct super_block *s, SB_ONDISK_JOURNAL_SIZE(s); tbh = journal_find_get_block(s, bn); if (tbh) { - if (buffer_dirty(tbh)) - ll_rw_block(WRITE, 1, &tbh) ; + if (buffer_dirty(tbh)) { + reiserfs_write_unlock(s); + ll_rw_block(WRITE, 1, &tbh); + reiserfs_write_lock(s); + } put_bh(tbh) ; } }