diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 09:54:12 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-07 09:54:12 +0300 |
commit | 05da1f643f00ae9aabb8318709e40579789b7c64 (patch) | |
tree | a07cc4996b7c70d590efa46b72e65abafd4fbd9d /fs/xfs | |
parent | af120709b1fb7227f18653a95c457b36d8a5e4d8 (diff) | |
parent | 6e552494fb90acae005d74ce6a2ee102d965184b (diff) | |
download | linux-05da1f643f00ae9aabb8318709e40579789b7c64.tar.xz |
Merge tag 'iomap-5.13-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull more iomap updates from Darrick Wong:
"Remove the now unused 'io_private' field from struct iomap_ioend, for
a modest savings in memory allocation"
* tag 'iomap-5.13-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: remove unused private field from ioend
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } } |