Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libtpool: -Wno-clobbered 

Also remove -Wno-unused-but-set-variable

Upstream-bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61118
Reviewed-by: Alejandro Colomar <alx.manpages@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13110
This commit is contained in:
наб 2022-02-16 16:06:08 +01:00 committed by Brian Behlendorf
parent 4b0977027b
commit 37430e8211
10 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/always-compiler-options.m4
View File

@ -88,7 +88,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION], [
]) ])
dnl # dnl #
dnl # Check if gcc supports -Wno-format-truncation option. dnl # Check if gcc supports -Wno-format-zero-length option.
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_ZERO_LENGTH], [ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_ZERO_LENGTH], [
AC_MSG_CHECKING([whether $CC supports -Wno-format-zero-length]) AC_MSG_CHECKING([whether $CC supports -Wno-format-zero-length])
@ -136,29 +136,29 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE], [
]) ])
dnl # dnl #
dnl # Check if gcc supports -Wno-unused-but-set-variable option. dnl # Check if gcc supports -Wno-clobbered option.
dnl # dnl #
dnl # We actually invoke gcc with the -Wunused-but-set-variable option dnl # We actually invoke gcc with the -Wclobbered option
dnl # and infer the 'no-' version does or doesn't exist based upon dnl # and infer the 'no-' version does or doesn't exist based upon
dnl # the results. This is required because when checking any of dnl # the results. This is required because when checking any of
dnl # no- prefixed options gcc always returns success. dnl # no- prefixed options gcc always returns success.
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE], [ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_CLOBBERED], [
AC_MSG_CHECKING([whether $CC supports -Wno-unused-but-set-variable]) AC_MSG_CHECKING([whether $CC supports -Wno-clobbered])
saved_flags="$CFLAGS" saved_flags="$CFLAGS"
CFLAGS="$CFLAGS -Werror -Wunused-but-set-variable" CFLAGS="$CFLAGS -Werror -Wclobbered"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable NO_CLOBBERED=-Wno-clobbered
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
], [ ], [
NO_UNUSED_BUT_SET_VARIABLE= NO_CLOBBERED=
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
CFLAGS="$saved_flags" CFLAGS="$saved_flags"
AC_SUBST([NO_UNUSED_BUT_SET_VARIABLE]) AC_SUBST([NO_CLOBBERED])
]) ])
dnl # dnl #

16
config/kernel-blk-queue.m4
View File

@ -259,17 +259,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_FLUSH], [
ZFS_LINUX_TEST_SRC([blk_queue_flush], [ ZFS_LINUX_TEST_SRC([blk_queue_flush], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
], [ ], [
struct request_queue *q = NULL; struct request_queue *q __attribute__ ((unused)) = NULL;
(void) blk_queue_flush(q, REQ_FLUSH); (void) blk_queue_flush(q, REQ_FLUSH);
], [$NO_UNUSED_BUT_SET_VARIABLE], [ZFS_META_LICENSE]) ], [], [ZFS_META_LICENSE])
ZFS_LINUX_TEST_SRC([blk_queue_write_cache], [ ZFS_LINUX_TEST_SRC([blk_queue_write_cache], [
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
], [ ], [
struct request_queue *q = NULL; struct request_queue *q __attribute__ ((unused)) = NULL;
blk_queue_write_cache(q, true, true); blk_queue_write_cache(q, true, true);
], [$NO_UNUSED_BUT_SET_VARIABLE], [ZFS_META_LICENSE]) ], [], [ZFS_META_LICENSE])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLUSH], [ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_FLUSH], [
@ -322,9 +322,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_MAX_HW_SECTORS], [
ZFS_LINUX_TEST_SRC([blk_queue_max_hw_sectors], [ ZFS_LINUX_TEST_SRC([blk_queue_max_hw_sectors], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
], [ ], [
struct request_queue *q = NULL; struct request_queue *q __attribute__ ((unused)) = NULL;
(void) blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS); (void) blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS);
], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS], [ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_HW_SECTORS], [
@ -345,9 +345,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_QUEUE_MAX_SEGMENTS], [
ZFS_LINUX_TEST_SRC([blk_queue_max_segments], [ ZFS_LINUX_TEST_SRC([blk_queue_max_segments], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
], [ ], [
struct request_queue *q = NULL; struct request_queue *q __attribute__ ((unused)) = NULL;
(void) blk_queue_max_segments(q, BLK_MAX_SEGMENTS); (void) blk_queue_max_segments(q, BLK_MAX_SEGMENTS);
], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS], [ AC_DEFUN([ZFS_AC_KERNEL_BLK_QUEUE_MAX_SEGMENTS], [

17
config/kernel-block-device-operations.m4
View File

@ -6,13 +6,16 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
unsigned int blk_check_events(struct gendisk *disk, unsigned int blk_check_events(struct gendisk *disk,
unsigned int clearing) { return (0); } unsigned int clearing) {
(void) disk, (void) clearing;
return (0);
}
static const struct block_device_operations static const struct block_device_operations
bops __attribute__ ((unused)) = { bops __attribute__ ((unused)) = {
.check_events = blk_check_events, .check_events = blk_check_events,
}; };
], [], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_CHECK_EVENTS], [
@ -31,7 +34,10 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
ZFS_LINUX_TEST_SRC([block_device_operations_release_void], [ ZFS_LINUX_TEST_SRC([block_device_operations_release_void], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
void blk_release(struct gendisk *g, fmode_t mode) { return; } void blk_release(struct gendisk *g, fmode_t mode) {
(void) g, (void) mode;
return;
}
static const struct block_device_operations static const struct block_device_operations
bops __attribute__ ((unused)) = { bops __attribute__ ((unused)) = {
@ -40,7 +46,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
.ioctl = NULL, .ioctl = NULL,
.compat_ioctl = NULL, .compat_ioctl = NULL,
}; };
], [], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_RELEASE_VOID], [
@ -61,6 +67,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
int blk_revalidate_disk(struct gendisk *disk) { int blk_revalidate_disk(struct gendisk *disk) {
(void) disk;
return(0); return(0);
} }
@ -68,7 +75,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [
bops __attribute__ ((unused)) = { bops __attribute__ ((unused)) = {
.revalidate_disk = blk_revalidate_disk, .revalidate_disk = blk_revalidate_disk,
}; };
], [], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [ AC_DEFUN([ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK], [

4
config/kernel-get-disk-ro.m4
View File

@ -5,9 +5,9 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_GET_DISK_RO], [
ZFS_LINUX_TEST_SRC([get_disk_ro], [ ZFS_LINUX_TEST_SRC([get_disk_ro], [
#include <linux/blkdev.h> #include <linux/blkdev.h>
],[ ],[
struct gendisk *disk = NULL; struct gendisk *disk __attribute__ ((unused)) = NULL;
(void) get_disk_ro(disk); (void) get_disk_ro(disk);
], [$NO_UNUSED_BUT_SET_VARIABLE]) ], [])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_RO], [ AC_DEFUN([ZFS_AC_KERNEL_GET_DISK_RO], [

2
config/zfs-build.m4
View File

@ -209,7 +209,7 @@ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
AX_COUNT_CPUS([]) AX_COUNT_CPUS([])
AC_SUBST(CPU_COUNT) AC_SUBST(CPU_COUNT)
ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE ZFS_AC_CONFIG_ALWAYS_CC_NO_CLOBBERED
ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH ZFS_AC_CONFIG_ALWAYS_CC_IMPLICIT_FALLTHROUGH
ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN

3
lib/libtpool/Makefile.am
View File

@ -1,5 +1,8 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61118
AM_CFLAGS += $(NO_CLOBBERED)
noinst_LTLIBRARIES = libtpool.la noinst_LTLIBRARIES = libtpool.la
USER_C = \ USER_C = \

1
lib/libzfs/Makefile.am
View File

@ -6,7 +6,6 @@ VPATH = \
$(top_srcdir)/lib/libzfs $(top_srcdir)/lib/libzfs
# Suppress unused but set variable warnings often due to ASSERTs # Suppress unused but set variable warnings often due to ASSERTs
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
AM_CFLAGS += $(LIBCRYPTO_CFLAGS) $(ZLIB_CFLAGS) AM_CFLAGS += $(LIBCRYPTO_CFLAGS) $(ZLIB_CFLAGS)
pkgconfig_DATA = libzfs.pc pkgconfig_DATA = libzfs.pc

3
lib/libzpool/Makefile.am
View File

@ -17,9 +17,6 @@ endif
# Unconditionally enable debugging for libzpool # Unconditionally enable debugging for libzpool
AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG AM_CPPFLAGS += -DDEBUG -UNDEBUG -DZFS_DEBUG
# Suppress unused but set variable warnings often due to ASSERTs
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
# Includes kernel code generate warnings for large stack frames # Includes kernel code generate warnings for large stack frames
AM_CFLAGS += $(FRAME_LARGER_THAN) AM_CFLAGS += $(FRAME_LARGER_THAN)

2
lib/libzutil/Makefile.am
View File

@ -1,7 +1,5 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
# Suppress unused but set variable warnings often due to ASSERTs
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUDEV_CFLAGS) AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUDEV_CFLAGS)
DEFAULT_INCLUDES += -I$(srcdir) DEFAULT_INCLUDES += -I$(srcdir)

2
module/os/linux/zfs/zio_crypt.c
View File

@ -1937,7 +1937,7 @@ zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key,
*/ */
if (qat_crypt_use_accel(datalen) && if (qat_crypt_use_accel(datalen) &&
ot != DMU_OT_INTENT_LOG && ot != DMU_OT_DNODE) { ot != DMU_OT_INTENT_LOG && ot != DMU_OT_DNODE) {
uint8_t *srcbuf, *dstbuf; uint8_t __attribute__((unused)) *srcbuf, *dstbuf;
if (encrypt) { if (encrypt) {
srcbuf = plainbuf; srcbuf = plainbuf;