diff --git a/[refs] b/[refs] index 603cb90d19b8..817f3bc7c322 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ebc423238341b52912c7295b045a32477b33f09 +refs/heads/master: a412f9efdd6424bf4bf28c8e8c92060b5e975482 diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c index 438c71f0bc91..0ba98ca367c7 100644 --- a/trunk/fs/reiserfs/journal.c +++ b/trunk/fs/reiserfs/journal.c @@ -1826,7 +1826,7 @@ static int kupdate_transactions(struct super_block *s, struct reiserfs_journal *journal = SB_JOURNAL(s); chunk.nr = 0; - mutex_lock(&journal->j_flush_mutex); + reiserfs_mutex_lock_safe(&journal->j_flush_mutex, s); if (!journal_list_still_alive(s, orig_trans_id)) { goto done; }