This is trying to fix a deadlock case in ocfs2. We firstly export jbd2 symbols jbd2_journal_[grab|put]_journal_head as preparation and later use them in ocfs2 insread of jbd_[lock|unlock]_bh_journal_head to fix the deadlock. Joseph Qi (2): jbd2: export jbd2_journal_[grab|put]_journal_head ocfs2: fix a deadlock when commit trans fs/jbd2/journal.c | 2 ++ fs/ocfs2/suballoc.c | 25 +++++++++++-------------- 2 files changed, 13 insertions(+), 14 deletions(-) -- 2.19.1.6.gb485710b