From 2cbd18de4aaabd7d8bb10d325ad475a6170dd2a5 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Feb 10 2022 23:54:54 +0000 Subject: Backport upstream changes from v5.15 to v5.16 --- diff --git a/SOURCES/0104-mm-don-t-include-linux-blkdev.h-in-linux-backing-dev.patch b/SOURCES/0104-mm-don-t-include-linux-blkdev.h-in-linux-backing-dev.patch new file mode 100644 index 0000000..76bbd8a --- /dev/null +++ b/SOURCES/0104-mm-don-t-include-linux-blkdev.h-in-linux-backing-dev.patch @@ -0,0 +1,31 @@ +From ccdf774189b6466457ca9c7de1fe9ed18547d249 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Mon, 20 Sep 2021 14:33:14 +0200 +Subject: [Backport ccdf774189b6] mm: don't include in + + +Move inode_to_bdi out of line to avoid having to include blkdev.h. + +Signed-off-by: Christoph Hellwig +Reviewed-by: Johannes Thumshirn +Link: https://lore.kernel.org/r/20210920123328.1399408-4-hch@lst.de +Signed-off-by: Jens Axboe +--- + src/file.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/file.c b/src/file.c +index 43b1451bff539576cd03c0f624708bf65b959270..a3cd3c3f091ec58b3d0626ae4e125555c11d8593 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -8,6 +8,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +2.31.1 + diff --git a/SOURCES/0105-ntfs3-use-bdev_nr_bytes-instead-of-open-coding-it.patch b/SOURCES/0105-ntfs3-use-bdev_nr_bytes-instead-of-open-coding-it.patch new file mode 100644 index 0000000..8703268 --- /dev/null +++ b/SOURCES/0105-ntfs3-use-bdev_nr_bytes-instead-of-open-coding-it.patch @@ -0,0 +1,31 @@ +From d54f13a8e479adbeea4585c62dbf0cc85cedf73c Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Mon, 18 Oct 2021 11:37:15 -0600 +Subject: [Backport d54f13a8e479] ntfs3: use bdev_nr_bytes instead of open + coding it + +Use the proper helper to read the block device size. + +Signed-off-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20211018101130.1838532-21-hch@lst.de +Signed-off-by: Jens Axboe +--- + src/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/super.c b/src/super.c +index d41d76979e121fd9e836ef0072b122ab6de3735b..29813200c7af9f71bc6b1217d249996215ffe1bc 100644 +--- a/src/super.c ++++ b/src/super.c +@@ -921,7 +921,7 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc) + + /* Parse boot. */ + err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512, +- bdev->bd_inode->i_size); ++ bdev_nr_bytes(bdev)); + if (err) + goto out; + +-- +2.31.1 + diff --git a/SOURCES/0106-ntfs3-use-sync_blockdev_nowait.patch b/SOURCES/0106-ntfs3-use-sync_blockdev_nowait.patch new file mode 100644 index 0000000..a89ca66 --- /dev/null +++ b/SOURCES/0106-ntfs3-use-sync_blockdev_nowait.patch @@ -0,0 +1,31 @@ +From 680e667bc2e4e458a373bbfd367b7174e4972eb5 Mon Sep 17 00:00:00 2001 +From: Christoph Hellwig +Date: Tue, 19 Oct 2021 08:25:29 +0200 +Subject: [Backport 680e667bc2e4] ntfs3: use sync_blockdev_nowait + +Use sync_blockdev_nowait instead of opencoding it. + +Signed-off-by: Christoph Hellwig +Reviewed-by: Chaitanya Kulkarni +Link: https://lore.kernel.org/r/20211019062530.2174626-7-hch@lst.de +Signed-off-by: Jens Axboe +--- + src/inode.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/inode.c b/src/inode.c +index 859951d785cb2f4380c85b1d799f66f008da7d45..a87ab3ad3cd386397e9c210c691824fe83b647a9 100644 +--- a/src/inode.c ++++ b/src/inode.c +@@ -1046,7 +1046,7 @@ int ntfs_flush_inodes(struct super_block *sb, struct inode *i1, + if (!ret && i2) + ret = writeback_inode(i2); + if (!ret) +- ret = filemap_flush(sb->s_bdev->bd_inode->i_mapping); ++ ret = sync_blockdev_nowait(sb->s_bdev); + return ret; + } + +-- +2.31.1 + diff --git a/SPECS/kmod-ntfs3.spec b/SPECS/kmod-ntfs3.spec index 528636a..9c20bf1 100644 --- a/SPECS/kmod-ntfs3.spec +++ b/SPECS/kmod-ntfs3.spec @@ -17,7 +17,7 @@ Name: kmod-%{pkg} Version: 5.14.0.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: NTFS filesystem support License: GPLv2 and GPLv2+ @@ -127,6 +127,9 @@ Patch100: 0100-fs-ntfs3-Refactor-ni_parse_reparse.patch Patch101: 0101-fs-ntfs3-Refactor-ntfs_read_mft.patch Patch102: 0102-fs-ntfs3-Check-for-NULL-pointers-in-ni_try_remove_at.patch Patch103: 0103-merge.patch +Patch104: 0104-mm-don-t-include-linux-blkdev.h-in-linux-backing-dev.patch +Patch105: 0105-ntfs3-use-bdev_nr_bytes-instead-of-open-coding-it.patch +Patch106: 0106-ntfs3-use-sync_blockdev_nowait.patch Patch9999: 9999-enable-ntfs3.patch ExclusiveArch: x86_64 aarch64 ppc64le @@ -158,6 +161,10 @@ Requires(post): %{_sbindir}/weak-modules Requires(postun): %{_sbindir}/weak-modules +%if "%{version}" == "5.14.0.0" && "%{release}" == "15%{?dist}" +Obsoletes: kmod-%{pkg} = %{?epoch:%{epoch}:}%{version}-14%{?dist} +%endif + %if "%{version}" == "5.14.0.0" && "%{release}" == "7%{?dist}" Obsoletes: kmod-%{pkg} = %{?epoch:%{epoch}:}%{version}-6%{?dist} %endif @@ -231,6 +238,10 @@ fi %changelog +* Thu Feb 10 2022 Peter Georg - 5.14.0.0-15 +- Backport upstream changes from v5.15 to v5.16 +- Missing iov_iter commit a6294593 + * Thu Feb 10 2022 Kmods SIG - 5.14.0.0-14 - Rebuild for 5.14.0-56.el9