From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [folded-merged] ocfs2-implement-ocfs2_direct_io_write-fix.patch removed from -mm tree Date: Mon, 15 Dec 2014 14:28:54 -0800 Message-ID: <548f60a6.CI5J53lsgde4sVaW%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43402 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbaLOW2z (ORCPT ); Mon, 15 Dec 2014 17:28:55 -0500 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: joseph.qi@huawei.com, alex.chen@huawei.com, jlbec@evilplan.org, mfasheh@suse.com, wangww631@huawei.com, xuejiufei@huawei.com, mm-commits@vger.kernel.org The patch titled Subject: ocfs2: fix brelse warning if ocfs2_direct_IO_get_blocks failed has been removed from the -mm tree. Its filename was ocfs2-implement-ocfs2_direct_io_write-fix.patch This patch was dropped because it was folded into ocfs2-implement-ocfs2_direct_io_write.patch ------------------------------------------------------ From: Joseph Qi Subject: ocfs2: fix brelse warning if ocfs2_direct_IO_get_blocks failed In ocfs2_direct_IO_write, if ocfs2_direct_IO_get_blocks failed, the di_bh will be used again in unlikely branch, and this will hit a warning "VFS: brelse: Trying to free free buffer" when jbd2 do checkpoint. Fix this issue by setting di_bh to NULL after brelse. Reported-by: alex chen Signed-off-by: Joseph Qi Reviewed-by: joyce.xue Cc: Weiwei Wang Cc: Joel Becker Cc: Mark Fasheh Signed-off-by: Andrew Morton --- fs/ocfs2/aops.c | 1 + 1 file changed, 1 insertion(+) diff -puN fs/ocfs2/aops.c~ocfs2-implement-ocfs2_direct_io_write-fix fs/ocfs2/aops.c --- a/fs/ocfs2/aops.c~ocfs2-implement-ocfs2_direct_io_write-fix +++ a/fs/ocfs2/aops.c @@ -692,6 +692,7 @@ static ssize_t ocfs2_direct_IO_write(str 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@huawei.com are origin.patch ocfs2-dlm-fix-race-between-dispatched_work-and-dlm_lockres_grab_inflight_worker.patch ocfs2-eliminate-the-static-flag-of-some-functions.patch ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir.patch ocfs2-add-orphan-recovery-types-in-ocfs2_recover_orphans.patch ocfs2-implement-ocfs2_direct_io_write.patch ocfs2-allocate-blocks-in-ocfs2_direct_io_get_blocks.patch ocfs2-do-not-fallback-to-buffer-i-o-write-if-appending.patch ocfs2-do-not-fallback-to-buffer-i-o-write-if-fill-holes.patch ocfs2-fix-leftover-orphan-entry-caused-by-append-o_direct-write-crash.patch