The patch titled Subject: ocfs2: no need get dinode bh when zeroing extend has been added to the -mm tree. Its filename is ocfs2-no-need-get-dinode-bh-when-zeroing-extend.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-no-need-get-dinode-bh-when-zeroing-extend.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-no-need-get-dinode-bh-when-zeroing-extend.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: Joseph Qi <joseph.qi@xxxxxxxxxx> Subject: ocfs2: no need get dinode bh when zeroing extend Since di_bh won't be used when zeroing extend, set it to NULL. Signed-off-by: Joseph Qi <joseph.qi@xxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/aops.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff -puN fs/ocfs2/aops.c~ocfs2-no-need-get-dinode-bh-when-zeroing-extend fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c~ocfs2-no-need-get-dinode-bh-when-zeroing-extend +++ a/fs/ocfs2/aops.c @@ -706,7 +706,7 @@ static ssize_t ocfs2_direct_IO_write(str } if (append_write) { - ret = ocfs2_inode_lock(inode, &di_bh, 1); + ret = ocfs2_inode_lock(inode, NULL, 1); if (ret < 0) { mlog_errno(ret); goto clean_orphan; @@ -720,7 +720,6 @@ static ssize_t ocfs2_direct_IO_write(str if (ret < 0) { mlog_errno(ret); ocfs2_inode_unlock(inode, 1); - brelse(di_bh); goto clean_orphan; } @@ -728,13 +727,10 @@ static ssize_t ocfs2_direct_IO_write(str if (is_overwrite < 0) { mlog_errno(is_overwrite); ocfs2_inode_unlock(inode, 1); - brelse(di_bh); goto clean_orphan; } ocfs2_inode_unlock(inode, 1); - brelse(di_bh); - di_bh = NULL; } written = __blockdev_direct_IO(WRITE, iocb, inode, inode->i_sb->s_bdev, _ Patches currently in -mm which might be from joseph.qi@xxxxxxxxxx are ocfs2-make-append_dio-an-incompat-feature.patch ocfs2-fix-a-typing-error-in-ocfs2_direct_io_write.patch ocfs2-no-need-get-dinode-bh-when-zeroing-extend.patch ocfs2-take-inode-lock-when-get-clusters.patch ocfs2-do-not-use-ocfs2_zero_extend-during-direct-io.patch ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages.patch ocfs2-avoid-access-invalid-address-when-read-o2dlm-debug-messages-v3.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