The patch titled Subject: ocfs2: unlock bh_state if bg check fails has been added to the -mm tree. Its filename is ocfs2-unlock-bh_state-if-bg-check-fails.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-unlock-bh_state-if-bg-check-fails.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-unlock-bh_state-if-bg-check-fails.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Changwei Ge <ge.changwei@xxxxxxx> Subject: ocfs2: unlock bh_state if bg check fails We should unlock bh_stat if bg->bg_free_bits_count > bg->bg_bits Link: http://lkml.kernel.org/r/1516843095-23680-1-git-send-email-ge.changwei@xxxxxxx Signed-off-by: Changwei Ge <ge.changwei@xxxxxxx> Suggested-by: Jan Kara <jack@xxxxxxx> Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Cc: Joseph Qi <jiangqi903@xxxxxxxxx> Cc: Changwei Ge <ge.changwei@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/suballoc.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN fs/ocfs2/suballoc.c~ocfs2-unlock-bh_state-if-bg-check-fails fs/ocfs2/suballoc.c --- a/fs/ocfs2/suballoc.c~ocfs2-unlock-bh_state-if-bg-check-fails +++ a/fs/ocfs2/suballoc.c @@ -2438,6 +2438,8 @@ static int ocfs2_block_group_clear_bits( } le16_add_cpu(&bg->bg_free_bits_count, num_bits); if (le16_to_cpu(bg->bg_free_bits_count) > le16_to_cpu(bg->bg_bits)) { + if (undo_fn) + jbd_unlock_bh_state(group_bh); return ocfs2_error(alloc_inode->i_sb, "Group descriptor # %llu has bit count %u but claims %u are freed. num_bits %d\n", (unsigned long long)le64_to_cpu(bg->bg_blkno), le16_to_cpu(bg->bg_bits), _ Patches currently in -mm which might be from ge.changwei@xxxxxxx are ocfs2-dlm-clean-dead-code-up.patch ocfs2-cluster-neaten-a-member-of-o2net_msg_handler.patch ocfs2-clean-dead-code-in-suballocc.patch ocfs2-clean-dead-code-up-in-allocc.patch ocfs2-make-metadata-estimation-accurate-and-clear.patch ocfs2-try-to-reuse-extent-block-in-dealloc-without-meta_alloc.patch ocfs2-unlock-bh_state-if-bg-check-fails.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html