From f2ceea3f1c33f5860046e5d0bede0fc61e20e5d3 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 22 Aug 2017 17:39:20 -0400 Subject: [PATCH] Support Linux kernel 4.13 Signed-off-by: Anders Kaseorg --- debian/changelog | 2 + ...esignated-initializers-where-require.patch | 62 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 65 insertions(+) create mode 100644 debian/patches/Linux-4.13-use-designated-initializers-where-require.patch diff --git a/debian/changelog b/debian/changelog index 7de685531..3d60ad7eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ openafs (1.6.21-2) UNRELEASED; urgency=medium for better reproducibility. - 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch: Fix rebasing mistake so -exit works correctly. + - Linux-4.13-use-designated-initializers-where-require.patch: Support + Linux kernel 4.13. (LP: #1706433) -- Anders Kaseorg Tue, 22 Aug 2017 17:22:44 -0400 diff --git a/debian/patches/Linux-4.13-use-designated-initializers-where-require.patch b/debian/patches/Linux-4.13-use-designated-initializers-where-require.patch new file mode 100644 index 000000000..a218066b2 --- /dev/null +++ b/debian/patches/Linux-4.13-use-designated-initializers-where-require.patch @@ -0,0 +1,62 @@ +From: Stephan Wiesand +Date: Mon, 24 Jul 2017 11:37:54 +0200 +Subject: Linux 4.13: use designated initializers where required + +struct path is declared with the "designated_init" attribute, +and module builds now use -Werror=designated-init. Cope. + +And as pointed out by Michael Meffie, struct ctl_table has +the same requirement now, so use a designated initializer +for the final element of the sysctl table too. + +Change-Id: I0ec45aac961dcefa0856a15ee218085626a357c7 +Reviewed-on: https://gerrit.openafs.org/12663 +Reviewed-by: Benjamin Kaduk +Tested-by: Benjamin Kaduk +--- + src/afs/LINUX/osi_misc.c | 2 +- + src/afs/LINUX/osi_sysctl.c | 8 ++++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/afs/LINUX/osi_misc.c b/src/afs/LINUX/osi_misc.c +index 627b477253..077d4edfb8 100644 +--- a/src/afs/LINUX/osi_misc.c ++++ b/src/afs/LINUX/osi_misc.c +@@ -140,7 +140,7 @@ int osi_abspath(char *aname, char *buf, int buflen, + code = osi_lookupname_internal(name, followlink, &mnt, &dp); + if (!code) { + #if defined(D_PATH_TAKES_STRUCT_PATH) +- afs_linux_path_t p = { mnt, dp }; ++ afs_linux_path_t p = { .mnt = mnt, .dentry = dp }; + path = d_path(&p, buf, buflen); + #else + path = d_path(dp, mnt, buf, buflen); +diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c +index 2b1be3b0c6..4d56c4eb99 100644 +--- a/src/afs/LINUX/osi_sysctl.c ++++ b/src/afs/LINUX/osi_sysctl.c +@@ -231,7 +231,9 @@ static struct ctl_table afs_sysctl_table[] = { + .mode = 0644, + .proc_handler = &proc_dointvec + }, +- {0} ++ { ++ .procname = 0 ++ } + }; + + static struct ctl_table fs_sysctl_table[] = { +@@ -247,7 +249,9 @@ static struct ctl_table fs_sysctl_table[] = { + .mode = 0555, + .child = afs_sysctl_table + }, +- {0} ++ { ++ .procname = 0 ++ } + }; + + int +-- +2.14.1 + diff --git a/debian/patches/series b/debian/patches/series index 2c50dd7ef..eb52f3c13 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch +Linux-4.13-use-designated-initializers-where-require.patch -- 2.39.5