From 682eafc699f4f920acef6b4c855f988b7d1380fa Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Tue, 5 Dec 2017 10:16:11 -0600 Subject: [PATCH] Update patches for new upstream version (That is, remove patches that we had cherry-picked in from upstream.) Change-Id: I80ccaf19284fafce7de148832341b3c85017c4d4 --- ...-exit-command-for-afsd-to-do-nothing.patch | 2 +- ...rsion_number.c-Respect-SOURCE_DATE_E.patch | 2 +- ...esignated-initializers-where-require.patch | 62 ------------ ...nux-uaccess.h-rather-than-asm-uacces.patch | 95 ------------------- debian/patches/series | 2 - 5 files changed, 2 insertions(+), 161 deletions(-) delete mode 100644 debian/patches/Linux-4.13-use-designated-initializers-where-require.patch delete mode 100644 debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch diff --git a/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch b/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch index e17d0f0db..a4588316c 100644 --- a/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch +++ b/debian/patches/0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch @@ -7,7 +7,7 @@ Subject: Add dummy -exit command for afsd to do nothing 1 file changed, 6 insertions(+) diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c -index 2f0478db19..a667719291 100644 +index 2f0478d..a667719 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -1919,6 +1919,11 @@ mainproc(struct cmd_syndesc *as, void *arock) diff --git a/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch index 448e3dabc..3c503c1a6 100644 --- a/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch +++ b/debian/patches/AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch @@ -12,7 +12,7 @@ Change-Id: Id379543a4782a7c1267eaa3d9258751d857cc07b 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/Makefile.version-NOCML.in b/src/config/Makefile.version-NOCML.in -index c8ab053c4..4c7bd1450 100644 +index c8ab053..4c7bd14 100644 --- a/src/config/Makefile.version-NOCML.in +++ b/src/config/Makefile.version-NOCML.in @@ -11,7 +11,7 @@ AFS_component_version_number.o: AFS_component_version_number.c 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 deleted file mode 100644 index a218066b2..000000000 --- a/debian/patches/Linux-4.13-use-designated-initializers-where-require.patch +++ /dev/null @@ -1,62 +0,0 @@ -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/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch b/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch deleted file mode 100644 index 7ddfc2e05..000000000 --- a/debian/patches/Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Seth Forshee -Date: Tue, 22 Aug 2017 07:59:11 -0500 -Subject: Linux: Include linux/uaccess.h rather than asm/uaccess.h if present - -Starting with Linux 4.12 there is a module build error on s390 -due to asm/uaccess.h using a macro defined in the common header. -The common header has been around since 2.6.18 and has always -included asm/uaccess.h, so switch to using the common header -whenever it is present. - -Signed-off-by: Seth Forshee -Reviewed-on: https://gerrit.openafs.org/12714 -Reviewed-by: Benjamin Kaduk -Tested-by: BuildBot -(cherry picked from commit 962f4838dc461567d896304f617a0923745d13d5) - -Reviewed-on: https://gerrit.openafs.org/12718 -Tested-by: BuildBot -Reviewed-by: Mark Vitale -Reviewed-by: Michael Meffie -Reviewed-by: Benjamin Kaduk -(cherry picked from commit 7073408688da021864bba59c592e8924e05adb91) - -Change-Id: Ie58cfcf48aa80c18f19cbfc65f87363b154e96ee ---- - acinclude.m4 | 1 + - src/afs/LINUX/osi_machdep.h | 4 ++++ - src/afs/sysincludes.h | 6 +++++- - src/rx/LINUX/rx_knet.c | 4 ++++ - 4 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index ee40b4109a..d80cacd780 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -877,6 +877,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) - AC_CHECK_LINUX_HEADER([semaphore.h]) - AC_CHECK_LINUX_HEADER([seq_file.h]) - AC_CHECK_LINUX_HEADER([sched/signal.h]) -+ AC_CHECK_LINUX_HEADER([uaccess.h]) - - dnl Type existence checks - AC_CHECK_LINUX_TYPE([struct vfs_path], [dcache.h]) -diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h -index 9008f7732e..ce8cabf6ee 100644 ---- a/src/afs/LINUX/osi_machdep.h -+++ b/src/afs/LINUX/osi_machdep.h -@@ -123,7 +123,11 @@ wakeup(void *event) - #define IsAfsVnode(V) ((V)->i_sb == afs_globalVFS) /* test superblock instead */ - #define SetAfsVnode(V) /* unnecessary */ - -+#if defined(HAVE_LINUX_UACCESS_H) -+#include -+#else - #include -+#endif - - #define copyin(F, T, C) (copy_from_user ((char*)(T), (char*)(F), (C)) > 0 ? EFAULT : 0) - static inline long copyinstr(char *from, char *to, int count, int *length) { -diff --git a/src/afs/sysincludes.h b/src/afs/sysincludes.h -index c2abb373a3..1898e1e28c 100644 ---- a/src/afs/sysincludes.h -+++ b/src/afs/sysincludes.h -@@ -151,7 +151,11 @@ struct coda_inode_info { - struct xfs_inode_info { - }; - # endif --# include -+# if defined(HAVE_LINUX_UACCESS_H) -+# include -+# else -+# include -+# endif - # include - # include - # include -diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c -index 1a5cfdefa0..29e73a1422 100644 ---- a/src/rx/LINUX/rx_knet.c -+++ b/src/rx/LINUX/rx_knet.c -@@ -18,7 +18,11 @@ - - #include - #include "rx/rx_kcommon.h" -+#if defined(HAVE_LINUX_UACCESS_H) -+#include -+#else - #include -+#endif - #ifdef ADAPT_PMTU - #include - #include --- -2.14.1 - diff --git a/debian/patches/series b/debian/patches/series index 437008604..2c50dd7ef 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 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 -Linux-Include-linux-uaccess.h-rather-than-asm-uacces.patch -- 2.39.5