Skip to content

Commit b9d9845

Browse files
committed
autoconf: AC_MSG_CHECKING consistency
Make the wording more consistent for the kernel AC_MSG_CHECKING output (e.g. "checking whether ...".). Additionally, group some of the VFS interface checks with the others. No functional change. Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Attila Fülöp <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #13529
1 parent 4c65262 commit b9d9845

9 files changed

+17
-17
lines changed

config/kernel-bio.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BLK_CGROUP_HEADER], [
464464
])
465465

466466
AC_DEFUN([ZFS_AC_KERNEL_BLK_CGROUP_HEADER], [
467-
AC_MSG_CHECKING([for existence of linux/blk-cgroup.h])
467+
AC_MSG_CHECKING([whether linux/blk-cgroup.h exists])
468468
ZFS_LINUX_TEST_RESULT([blk_cgroup_header],[
469469
AC_MSG_RESULT(yes)
470470
AC_DEFINE(HAVE_LINUX_BLK_CGROUP_HEADER, 1,
@@ -500,7 +500,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_BIO_ALLOC_4ARG], [
500500
])
501501

502502
AC_DEFUN([ZFS_AC_KERNEL_BIO_ALLOC_4ARG], [
503-
AC_MSG_CHECKING([for 4-argument bio_alloc()])
503+
AC_MSG_CHECKING([whether bio_alloc() wants 4 args])
504504
ZFS_LINUX_TEST_RESULT([bio_alloc_4arg],[
505505
AC_MSG_RESULT(yes)
506506
AC_DEFINE([HAVE_BIO_ALLOC_4ARG], 1, [bio_alloc() takes 4 arguments])

config/kernel-pagemap-folio_wait_bit.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT], [
1515
])
1616

1717
AC_DEFUN([ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT], [
18-
AC_MSG_CHECKING([folio_wait_bit() exists])
18+
AC_MSG_CHECKING([whether folio_wait_bit() exists])
1919
ZFS_LINUX_TEST_RESULT([pagemap_has_folio_wait_bit], [
2020
AC_MSG_RESULT([yes])
2121
AC_DEFINE(HAVE_PAGEMAP_FOLIO_WAIT_BIT, 1,

config/kernel-readpages.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_READPAGES], [
1414
])
1515

1616
AC_DEFUN([ZFS_AC_KERNEL_VFS_READPAGES], [
17-
AC_MSG_CHECKING([address_space_operations->readpages exists])
17+
AC_MSG_CHECKING([whether aops->readpages exists])
1818
ZFS_LINUX_TEST_RESULT([vfs_has_readpages], [
1919
AC_MSG_RESULT([yes])
2020
AC_DEFINE(HAVE_VFS_READPAGES, 1,

config/kernel-shrink.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SHRINKER_CALLBACK], [
8484
AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
8585
dnl #
8686
dnl # 3.0 - 3.11 API change
87-
dnl # ->shrink(struct shrinker *, struct shrink_control *sc)
87+
dnl # cs->shrink(struct shrinker *, struct shrink_control *sc)
8888
dnl #
8989
AC_MSG_CHECKING([whether new 2-argument shrinker exists])
9090
ZFS_LINUX_TEST_RESULT([shrinker_cb_shrink_control], [
@@ -96,14 +96,14 @@ AC_DEFUN([ZFS_AC_KERNEL_SHRINKER_CALLBACK],[
9696
9797
dnl #
9898
dnl # 3.12 API change,
99-
dnl # ->shrink() is logically split in to
100-
dnl # ->count_objects() and ->scan_objects()
99+
dnl # cs->shrink() is logically split in to
100+
dnl # cs->count_objects() and cs->scan_objects()
101101
dnl #
102-
AC_MSG_CHECKING([whether ->count_objects callback exists])
102+
AC_MSG_CHECKING([whether cs->count_objects callback exists])
103103
ZFS_LINUX_TEST_RESULT([shrinker_cb_shrink_control_split], [
104104
AC_MSG_RESULT(yes)
105105
AC_DEFINE(HAVE_SPLIT_SHRINKER_CALLBACK, 1,
106-
[->count_objects exists])
106+
[cs->count_objects exists])
107107
],[
108108
ZFS_LINUX_TEST_ERROR([shrinker])
109109
])

config/kernel-sysfs.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_SYSFS_DEFAULT_GROUPS], [
1919
])
2020

2121
AC_DEFUN([ZFS_AC_KERNEL_SYSFS_DEFAULT_GROUPS], [
22-
AC_MSG_CHECKING([for struct kobj_type.default_groups])
22+
AC_MSG_CHECKING([whether struct kobj_type.default_groups exists])
2323
ZFS_LINUX_TEST_RESULT([sysfs_default_groups],[
2424
AC_MSG_RESULT(yes)
2525
AC_DEFINE([HAVE_SYSFS_DEFAULT_GROUPS], 1, [struct kobj_type has default_groups])

config/kernel-vfs-filemap_dirty_folio.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_FILEMAP_DIRTY_FOLIO], [
1919
dnl # Linux 5.18 uses filemap_dirty_folio in lieu of
2020
dnl # ___set_page_dirty_nobuffers
2121
dnl #
22-
AC_MSG_CHECKING([filemap_dirty_folio exists])
22+
AC_MSG_CHECKING([whether filemap_dirty_folio exists])
2323
ZFS_LINUX_TEST_RESULT([vfs_has_filemap_dirty_folio], [
2424
AC_MSG_RESULT([yes])
2525
AC_DEFINE(HAVE_VFS_FILEMAP_DIRTY_FOLIO, 1,

config/kernel-vfs-read_folio.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_READ_FOLIO], [
2222
dnl #
2323
dnl # Linux 5.19 uses read_folio in lieu of readpage
2424
dnl #
25-
AC_MSG_CHECKING([read_folio exists])
25+
AC_MSG_CHECKING([whether read_folio exists])
2626
ZFS_LINUX_TEST_RESULT([vfs_has_read_folio], [
2727
AC_MSG_RESULT([yes])
2828
AC_DEFINE(HAVE_VFS_READ_FOLIO, 1, [read_folio exists])

config/kernel-vfs-set_page_dirty.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS], [
2323
dnl # Linux 5.14 change requires set_page_dirty() to be assigned
2424
dnl # in address_space_operations()
2525
dnl #
26-
AC_MSG_CHECKING([__set_page_dirty_nobuffers exists])
26+
AC_MSG_CHECKING([whether __set_page_dirty_nobuffers exists])
2727
ZFS_LINUX_TEST_RESULT([vfs_has_set_page_dirty_nobuffers], [
2828
AC_MSG_RESULT([yes])
2929
AC_DEFINE(HAVE_VFS_SET_PAGE_DIRTY_NOBUFFERS, 1,

config/kernel.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
107107
ZFS_AC_KERNEL_SRC_VFS_FSYNC_2ARGS
108108
ZFS_AC_KERNEL_SRC_VFS_ITERATE
109109
ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO
110+
ZFS_AC_KERNEL_SRC_VFS_READPAGES
111+
ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
110112
ZFS_AC_KERNEL_SRC_VFS_RW_ITERATE
111113
ZFS_AC_KERNEL_SRC_VFS_GENERIC_WRITE_CHECKS
112114
ZFS_AC_KERNEL_SRC_VFS_IOV_ITER
@@ -137,8 +139,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
137139
ZFS_AC_KERNEL_SRC_SIGINFO
138140
ZFS_AC_KERNEL_SRC_SYSFS
139141
ZFS_AC_KERNEL_SRC_SET_SPECIAL_STATE
140-
ZFS_AC_KERNEL_SRC_VFS_READPAGES
141-
ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
142142
ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
143143
ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
144144
ZFS_AC_KERNEL_SRC_ADD_DISK
@@ -225,6 +225,8 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
225225
ZFS_AC_KERNEL_VFS_FSYNC_2ARGS
226226
ZFS_AC_KERNEL_VFS_ITERATE
227227
ZFS_AC_KERNEL_VFS_DIRECT_IO
228+
ZFS_AC_KERNEL_VFS_READPAGES
229+
ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
228230
ZFS_AC_KERNEL_VFS_RW_ITERATE
229231
ZFS_AC_KERNEL_VFS_GENERIC_WRITE_CHECKS
230232
ZFS_AC_KERNEL_VFS_IOV_ITER
@@ -255,8 +257,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
255257
ZFS_AC_KERNEL_SIGINFO
256258
ZFS_AC_KERNEL_SYSFS
257259
ZFS_AC_KERNEL_SET_SPECIAL_STATE
258-
ZFS_AC_KERNEL_VFS_READPAGES
259-
ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
260260
ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
261261
ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
262262
ZFS_AC_KERNEL_ADD_DISK

0 commit comments

Comments
 (0)