The patch titled
Subject: ocfs2: fix null handle in ocfs2_write_zero_page
has been added to the -mm tree. Its filename is
ocfs2-fix-deadlock-due-to-wrong-locking-order-fix.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-fix-deadlock-due-to-wrong-locking-order-fix.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-fix-deadlock-due-to-wrong-locking-order-fix.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: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Subject: ocfs2: fix null handle in ocfs2_write_zero_page
ocfs2_zero_start_ordered_transaction() will return NULL handle in data
writeback mode, this should be checked and bypass journal ops, or kernel
panic will be triggered.
Signed-off-by: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Alex Chen <alex.chen@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/file.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN fs/ocfs2/file.c~ocfs2-fix-deadlock-due-to-wrong-locking-order-fix fs/ocfs2/file.c
--- a/fs/ocfs2/file.c~ocfs2-fix-deadlock-due-to-wrong-locking-order-fix
+++ a/fs/ocfs2/file.c
@@ -833,14 +833,17 @@ static int ocfs2_write_zero_page(struct
di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
di->i_mtime_nsec = di->i_ctime_nsec;
- ocfs2_journal_dirty(handle, di_bh);
- ocfs2_update_inode_fsync_trans(handle, inode, 1);
+ if (handle) {
+ ocfs2_journal_dirty(handle, di_bh);
+ ocfs2_update_inode_fsync_trans(handle, inode, 1);
+ }
out_unlock:
unlock_page(page);
page_cache_release(page);
out_commit_trans:
- ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
+ if (handle)
+ ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
out:
return ret;
}
_
Patches currently in -mm which might be from junxiao.bi@xxxxxxxxxx are
ocfs2-dont-fire-quorum-before-connection-established.patch
ocfs2-reflink-fix-slow-unlink-for-refcounted-file.patch
ocfs2-fix-journal-commit-deadlock.patch
ocfs2-fix-deadlock-due-to-wrong-locking-order.patch
ocfs2-fix-deadlock-due-to-wrong-locking-order-fix.patch
mm-clear-__gfp_fs-when-pf_memalloc_noio-is-set.patch
ocfs2-fix-a-deadlock-while-o2net_wq-doing-direct-memory-reclaim.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
