btrfs/xfs: fixes build with gcc7

Fixes: #30
xxooomg · Sep 20, 2022 · 33c6f30 · 33c6f30
1 parent 44e2172
commit 33c6f30
Showing 3 changed files with 106 additions and 0 deletions.
diff --git a/target/linux/ipq60xx/patches-4.4/011-fault_in_multipages_readable-throws.patch b/target/linux/ipq60xx/patches-4.4/011-fault_in_multipages_readable-throws.patch
@@ -0,0 +1,36 @@
+From 90b75db6498a19da96dac4b55c909ff3721f3045 Mon Sep 17 00:00:00 2001
+From: Dave Chinner <dchinner@redhat.com>
+Date: Mon, 26 Sep 2016 09:57:33 +1000
+Subject: [PATCH] fault_in_multipages_readable() throws set-but-unused error
+
+When building XFS with -Werror, it now fails with:
+
+  include/linux/pagemap.h: In function 'fault_in_multipages_readable':
+  include/linux/pagemap.h:602:16: error: variable 'c' set but not used [-Werror=unused-but-set-variable]
+    volatile char c;
+                  ^
+
+This is a regression caused by commit e23d4159b109 ("fix
+fault_in_multipages_...() on architectures with no-op access_ok()").
+Fix it by re-adding the "(void)c" trick taht was previously used to make
+the compiler think the variable is used.
+
+Signed-off-by: Dave Chinner <dchinner@redhat.com>
+Cc: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+ include/linux/pagemap.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
+index 7e3d537536122..01e84436cddfe 100644
+--- a/include/linux/pagemap.h
++++ b/include/linux/pagemap.h
+@@ -650,6 +650,7 @@ static inline int fault_in_multipages_readable(const char __user *uaddr,
+ 		return __get_user(c, end);
+ 	}
+
++	(void)c;
+ 	return 0;
+ }
+
diff --git a/target/linux/ipq60xx/patches-4.4/012-btrfs-remove-duplicate-const-specifier.patch b/target/linux/ipq60xx/patches-4.4/012-btrfs-remove-duplicate-const-specifier.patch
@@ -0,0 +1,25 @@
+From fb75d857a31d600cc0c37b8c7d914014f7fa3f9a Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 19 Jan 2016 00:05:28 +0000
+Subject: btrfs: remove duplicate const specifier
+
+duplicate const is redundant so remove it
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/volumes.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/btrfs/volumes.c
++++ b/fs/btrfs/volumes.c
+@@ -108,7 +108,7 @@ const struct btrfs_raid_attr btrfs_raid_
+ 	},
+ };
+
+-const u64 const btrfs_raid_group[BTRFS_NR_RAID_TYPES] = {
++const u64 btrfs_raid_group[BTRFS_NR_RAID_TYPES] = {
+ 	[BTRFS_RAID_RAID10] = BTRFS_BLOCK_GROUP_RAID10,
+ 	[BTRFS_RAID_RAID1]  = BTRFS_BLOCK_GROUP_RAID1,
+ 	[BTRFS_RAID_DUP]    = BTRFS_BLOCK_GROUP_DUP,
diff --git a/target/linux/ipq60xx/patches-4.4/013-xfs-avoid-harmless-gcc-7-warnings.patch b/target/linux/ipq60xx/patches-4.4/013-xfs-avoid-harmless-gcc-7-warnings.patch
@@ -0,0 +1,45 @@
+From 0cbe48cc5814ae26e4058c5d666914c86a4a6b5d Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 14 Jun 2017 21:35:34 -0700
+Subject: [PATCH] xfs: avoid harmless gcc-7 warnings
+
+gcc-7 flags the use of integer math inside of a condition
+as a potential bug:
+
+fs/xfs/xfs_bmap_util.c: In function 'xfs_swap_extents_check_format':
+fs/xfs/xfs_bmap_util.c:1619:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
+fs/xfs/xfs_bmap_util.c:1629:8: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context]
+
+There is already a helper function for testing the di_forkoff
+field for zero, so let's use that instead to shut up the warning.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Reviewed-by: Christoph Hellwig <hch@lst.de>
+Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+---
+ fs/xfs/xfs_bmap_util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
+index 9e3cc2146d5b..7493a64f5b99 100644
+--- a/fs/xfs/xfs_bmap_util.c
++++ b/fs/xfs/xfs_bmap_util.c
+@@ -1665,7 +1665,7 @@ xfs_swap_extents_check_format(
+ 	 * extent format...
+ 	 */
+ 	if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
+-		if (XFS_IFORK_BOFF(ip) &&
++		if (XFS_IFORK_Q(ip) &&
+ 		    XFS_BMAP_BMDR_SPACE(tip->i_df.if_broot) > XFS_IFORK_BOFF(ip))
+ 			return -EINVAL;
+ 		if (XFS_IFORK_NEXTENTS(tip, XFS_DATA_FORK) <=
+@@ -1675,7 +1675,7 @@ xfs_swap_extents_check_format(
+
+ 	/* Reciprocal target->temp btree format checks */
+ 	if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) {
+-		if (XFS_IFORK_BOFF(tip) &&
++		if (XFS_IFORK_Q(tip) &&
+ 		    XFS_BMAP_BMDR_SPACE(ip->i_df.if_broot) > XFS_IFORK_BOFF(tip))
+ 			return -EINVAL;
+ 		if (XFS_IFORK_NEXTENTS(ip, XFS_DATA_FORK) <=