Skip to content

Commit c03a82b

Browse files
Lizhi Xuakpm00
authored andcommitted
ocfs2: remove unreasonable unlock in ocfs2_read_blocks
Patch series "Misc fixes for ocfs2_read_blocks", v5. This series contains 2 fixes for ocfs2_read_blocks(). The first patch fix the issue reported by syzbot, which detects bad unlock balance in ocfs2_read_blocks(). The second patch fixes an issue reported by Heming Zhao when reviewing above fix. This patch (of 2): There was a lock release before exiting, so remove the unreasonable unlock. Link: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Fixes: cf76c78 ("ocfs2: don't put and assigning null to bh allocated outside") Signed-off-by: Lizhi Xu <[email protected]> Signed-off-by: Joseph Qi <[email protected]> Reviewed-by: Heming Zhao <[email protected]> Reviewed-by: Joseph Qi <[email protected]> Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=ab134185af9ef88dfed5 Tested-by: [email protected] Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Cc: Junxiao Bi <[email protected]> Cc: Changwei Ge <[email protected]> Cc: Gang He <[email protected]> Cc: Jun Piao <[email protected]> Cc: <[email protected]> [4.20+] Signed-off-by: Andrew Morton <[email protected]>
1 parent 5784d9f commit c03a82b

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

fs/ocfs2/buffer_head_io.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr,
235235
if (bhs[i] == NULL) {
236236
bhs[i] = sb_getblk(sb, block++);
237237
if (bhs[i] == NULL) {
238-
ocfs2_metadata_cache_io_unlock(ci);
239238
status = -ENOMEM;
240239
mlog_errno(status);
241240
/* Don't forget to put previous bh! */

0 commit comments

Comments
 (0)