[folded-merged] ocfs2-implement-ocfs2_direct_io_write-fix.patch removed from -mm tree

[folded-merged] ocfs2-implement-ocfs2_direct_io_write-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: ocfs2-implement-ocfs2_direct_io_write-fix
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: Andrew Morton <akpm@linux-foundation.org>
Subject: ocfs2-implement-ocfs2_direct_io_write-fix

fix it for "block: Add discard flag to blkdev_issue_zeroout() function"

Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Weiwei Wang <wangww631@huawei.com>
Cc: alex chen <alex.chen@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ocfs2/aops.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
@@ -748,8 +748,7 @@ static ssize_t ocfs2_direct_IO_write(str
 
 		ret = blkdev_issue_zeroout(osb->sb->s_bdev,
 				p_cpos << (osb->s_clustersize_bits - 9),
-				zero_len >> 9,
-				GFP_KERNEL);
+				zero_len >> 9, GFP_KERNEL, false);
 		if (ret < 0)
 			mlog_errno(ret);
 	}
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

origin.patch
mm-fix-xip-fault-vs-truncate-race.patch
daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler.patch
dax-add-dax_zero_page_range.patch
ext4-add-dax-functionality.patch
ocfs2-add-functions-to-add-and-remove-inode-in-orphan-dir.patch
ocfs2-implement-ocfs2_direct_io_write.patch

[folded-merged] ocfs2-implement-ocfs2_direct_io_write-fix.patch removed from -mm tree

[akpm]

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 <joseph.qi@huawei.com>
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 <alex.chen@huawei.com>
Signed-off-by: Joseph Qi <joseph.qi@huawei.com>
Reviewed-by: joyce.xue <xuejiufei@huawei.com>
Cc: Weiwei Wang <wangww631@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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