VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-06 23:54:12 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-06 23:54:12 -0700 commit: 05da1f643f00ae9aabb8318709e40579789b7c64 parent: af120709b1fb7227f18653a95c457b36d8a5e4d8

Commit Summary:

Merge tag 'iomap-5.13-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Diffstat:

1 file changed, 1 insertion, 1 deletion

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 9b08db45ce85..826caa6b4a5a 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -146,7 +146,7 @@ xfs_end_io(
 	while ((ioend = list_first_entry_or_null(&tmp, struct iomap_ioend,
 			io_list))) {
 		list_del_init(&ioend->io_list);
-		iomap_ioend_try_merge(ioend, &tmp, NULL);
+		iomap_ioend_try_merge(ioend, &tmp);
 		xfs_end_ioend(ioend);
 	}
 }