Your message dated Wed, 04 Feb 2015 19:19:05 +0000 with message-id <e1yj5td-0004uo...@franck.debian.org> and subject line Bug#771298: fixed in openafs 1.6.10-4 has caused the Debian Bug report #771298, regarding openafs-modules-dkms: fails to build against v3.18 based kernels to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 771298: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=771298 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: openafs Version: 1.6.10-3 Severity: important Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu vivid ubuntu-patch Dear Maintainer, In Ubuntu we are about to switch up to a v3.18 based kernel. It seems there are a trio of incompatibilities exposed there for the DKMS module. They all seem pretty safely fixed, and we have just uploaded that to Ubuntu for testing. In Ubuntu, the attached patch was applied to achieve the following: * Upstream v3.18 porting (LP: #1397275): - follow removal of key_type match op - follow removal of ctl_table typedef - d_invalidate now returns void Thanks for considering these patches for Debian. -apw -- System Information: Debian Release: jessie/sid APT prefers vivid-updates APT policy: (500, 'vivid-updates'), (500, 'vivid-security'), (500, 'vivid'), (100, 'vivid-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.18.0-4-generic (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dashdiff -Nru openafs-1.6.10/debian/changelog openafs-1.6.10/debian/changelog diff -Nru openafs-1.6.10/debian/patches/series openafs-1.6.10/debian/patches/series --- openafs-1.6.10/debian/patches/series 2014-11-06 20:06:47.000000000 +0000 +++ openafs-1.6.10/debian/patches/series 2014-11-27 21:21:32.000000000 +0000 @@ -1,3 +1,6 @@ 0001-userok.c-Fix-fixed-size-on-stack-path-buffers.patch 0002-Tweak-AFSDIR_PATH_MAX-definition.patch 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch +ubuntu-v3.18-key_type-removes-match.patch +ubuntu-v3.18-typedef-ctl_table-removed.patch +ubuntu-v3.18-d_invalidate-returns-void.patch diff -Nru openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch --- openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch 1970-01-01 01:00:00.000000000 +0100 +++ openafs-1.6.10/debian/patches/ubuntu-v3.18-d_invalidate-returns-void.patch 2014-11-27 21:42:33.000000000 +0000 @@ -0,0 +1,61 @@ +Description: v3.18 porting -- d_invalidate now returns void + In v3.18 they have changed d_invalidate to return void as it can no + longer fail. Comment out the recovery code as it is no longer needed. +Author: Andy Whitcroft <a...@ubuntu.com> +--- + +--- openafs-1.6.10.orig/src/afs/LINUX/osi_vcache.c ++++ openafs-1.6.10/src/afs/LINUX/osi_vcache.c +@@ -39,11 +39,15 @@ restart: + dget_locked(dentry); + + spin_unlock(&dcache_lock); ++#if defined(D_INVALIDATE_NOT_VOID) + if (d_invalidate(dentry) == -EBUSY) { + dput(dentry); + /* perhaps lock and try to continue? (use cur as head?) */ + goto inuse; + } ++#else ++ d_invalidate(dentry); ++#endif + dput(dentry); + spin_lock(&dcache_lock); + goto restart; +@@ -71,11 +75,15 @@ restart: + dget(dentry); + + spin_unlock(&inode->i_lock); ++#if defined(D_INVALIDATE_NOT_VOID) + if (d_invalidate(dentry) == -EBUSY) { + dput(dentry); + /* perhaps lock and try to continue? (use cur as head?) */ + goto inuse; + } ++#else ++ d_invalidate(dentry); ++#endif + dput(dentry); + spin_lock(&inode->i_lock); + goto restart; +--- openafs-1.6.10.orig/src/cf/linux-test4.m4 ++++ openafs-1.6.10/src/cf/linux-test4.m4 +@@ -182,6 +182,18 @@ AC_DEFUN([LINUX_INODE_SETATTR_RETURN_TYP + ]) + + ++AC_DEFUN([LINUX_D_INVALIDATE_RETURN_TYPE], [ ++ AC_CHECK_LINUX_BUILD([for d_invalidate return type], ++ [ac_cv_linux_func_d_invalidater_returns_int], ++ [#include <linux/dentry.h>], ++ [struct dentry _dentry; ++ int i; ++ i = d_invalidate(&_dentry);], ++ [D_INVALIDATE_NOT_VOID], ++ [define if your d_invalidate return return non-void], ++ []) ++]) ++ + + AC_DEFUN([LINUX_AOP_WRITEBACK_CONTROL], [ + AC_CHECK_LINUX_BUILD([whether aop.writepage takes a writeback_control], diff -Nru openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch --- openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch 1970-01-01 01:00:00.000000000 +0100 +++ openafs-1.6.10/debian/patches/ubuntu-v3.18-key_type-removes-match.patch 2014-11-27 21:42:13.000000000 +0000 @@ -0,0 +1,46 @@ +Description: v3.18 porting -- follow removal of key_type match op + In v3.18 they have removed the key_type match op. This now defaults to + a direct match. As this is what the afs match does we can simply stop + supplying our match. +Author: Andy Whitcroft <a...@ubuntu.com> +--- + +Index: openafs-1.6.10/acinclude.m4 +=================================================================== +--- openafs-1.6.10.orig/acinclude.m4 ++++ openafs-1.6.10/acinclude.m4 +@@ -842,6 +842,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinu + AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h]) + AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h]) + AC_CHECK_LINUX_STRUCT([key_type], [instantiate_prep], [key-type.h]) ++ AC_CHECK_LINUX_STRUCT([key_type], [match], [key-type.h]) + AC_CHECK_LINUX_STRUCT([nameidata], [path], [namei.h]) + AC_CHECK_LINUX_STRUCT([proc_dir_entry], [owner], [proc_fs.h]) + AC_CHECK_LINUX_STRUCT([super_block], [s_bdi], [fs.h]) +Index: openafs-1.6.10/src/afs/LINUX/osi_groups.c +=================================================================== +--- openafs-1.6.10.orig/src/afs/LINUX/osi_groups.c ++++ openafs-1.6.10/src/afs/LINUX/osi_groups.c +@@ -498,10 +498,12 @@ error: + return code; + } + ++#if defined(STRUCT_KEY_TYPE_HAS_MATCH) + static int afs_pag_match(const struct key *key, const void *description) + { + return strcmp(key->description, description) == 0; + } ++#endif + + static void afs_pag_destroy(struct key *key) + { +@@ -527,7 +529,9 @@ struct key_type key_type_afs_pag = + #else + .instantiate = afs_pag_instantiate, + #endif ++#if defined(STRUCT_KEY_TYPE_HAS_MATCH) + .match = afs_pag_match, ++#endif + .destroy = afs_pag_destroy, + }; + diff -Nru openafs-1.6.10/debian/patches/ubuntu-v3.18-typedef-ctl_table-removed.patch openafs-1.6.10/debian/patches/ubuntu-v3.18-typedef-ctl_table-removed.patch --- openafs-1.6.10/debian/patches/ubuntu-v3.18-typedef-ctl_table-removed.patch 1970-01-01 01:00:00.000000000 +0100 +++ openafs-1.6.10/debian/patches/ubuntu-v3.18-typedef-ctl_table-removed.patch 2014-11-27 18:06:17.000000000 +0000 @@ -0,0 +1,41 @@ +Description: v3.18 porting -- follow removal of ctl_table typedef + In v3.18 they have removed the ctl_table typedef, existing code has all + been converted to use struct ctl_table. Do the same here, as this is the + type from inception we do not need to make this change conditional. +Author: Andy Whitcroft <a...@ubuntu.com> + +Index: openafs-1.6.10/src/afs/LINUX/osi_sysctl.c +=================================================================== +--- openafs-1.6.10.orig/src/afs/LINUX/osi_sysctl.c ++++ openafs-1.6.10/src/afs/LINUX/osi_sysctl.c +@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; + #ifdef CONFIG_SYSCTL + static struct ctl_table_header *afs_sysctl = NULL; + +-static ctl_table afs_sysctl_table[] = { ++static struct ctl_table afs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { + {0} + }; + +-static ctl_table fs_sysctl_table[] = { ++static struct ctl_table fs_sysctl_table[] = { + { + #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) + #if defined(CTL_UNNUMBERED) +Index: openafs-1.6.10/src/cf/linux-test4.m4 +=================================================================== +--- openafs-1.6.10.orig/src/cf/linux-test4.m4 ++++ openafs-1.6.10/src/cf/linux-test4.m4 +@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NO + AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], + [ac_cv_linux_register_sysctl_table_noflag], + [#include <linux/sysctl.h>], +- [ctl_table *t; register_sysctl_table (t);], ++ [struct ctl_table *t; register_sysctl_table (t);], + [REGISTER_SYSCTL_TABLE_NOFLAG], + [define if register_sysctl_table has no insert_at head flag], + [])
--- End Message ---
--- Begin Message ---Source: openafs Source-Version: 1.6.10-4 We believe that the bug you reported is fixed in the latest version of openafs, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 771...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Benjamin Kaduk <ka...@mit.edu> (supplier of updated openafs package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Format: 1.8 Date: Wed, 04 Feb 2015 13:35:48 -0500 Source: openafs Binary: openafs-client openafs-fuse openafs-kpasswd openafs-fileserver openafs-dbserver openafs-doc openafs-krb5 libkopenafs1 libafsauthent1 libafsrpc1 libopenafs-dev openafs-modules-source openafs-modules-dkms libpam-openafs-kaserver openafs-dbg Architecture: source amd64 all Version: 1.6.10-4 Distribution: unstable Urgency: medium Maintainer: Benjamin Kaduk <ka...@mit.edu> Changed-By: Benjamin Kaduk <ka...@mit.edu> Description: libafsauthent1 - AFS distributed file system runtime library (authentication) libafsrpc1 - AFS distributed file system runtime library (RPC layer) libkopenafs1 - AFS distributed file system runtime library (PAGs) libopenafs-dev - AFS distributed filesystem development libraries libpam-openafs-kaserver - AFS distributed filesystem kaserver PAM module openafs-client - AFS distributed filesystem client support openafs-dbg - AFS distributed filesystem debugging information openafs-dbserver - AFS distributed filesystem database server openafs-doc - AFS distributed filesystem documentation openafs-fileserver - AFS distributed filesystem file server openafs-fuse - AFS distributed file system experimental FUSE client openafs-kpasswd - AFS distributed filesystem old password changing openafs-krb5 - AFS distributed filesystem Kerberos 5 integration openafs-modules-dkms - AFS distributed filesystem kernel module DKMS source openafs-modules-source - AFS distributed filesystem kernel module source Closes: 771298 773565 Changes: openafs (1.6.10-4) unstable; urgency=medium . * Update Spanish translation, thanks Javier Fernandez-Sanguino Pena. (Closes: #773565) * Import many patches from upstream: - Support newer linux versions, up through 3.19. (Closes: #771298) - Avoid some spurious getcwd() failures. - Improve configure test for key_type.match (which caused buggy behavior in certain versions of RHEL). - Fix a refcount leak that would manifest as an unrelated OOPS. - Avoid using a stale data version in certain cases when writing files larger than the AFS cache, which manifested as file corruption. This leaves us roughly equivalent to the forthcoming 1.6.11pre2 release candidate. * Update CellServDB to the 2015-01-19 release. Checksums-Sha1: 240c2b3de3e523468da2916f426763658da8ef5e 3798 openafs_1.6.10-4.dsc c696aa2147be4e775121b88a8a851a3f5f11d27a 147672 openafs_1.6.10-4.debian.tar.xz 5fdbf2e46ae6aab46fd7b66a367ee93df83f6f53 1966876 openafs-client_1.6.10-4_amd64.deb 49b081b14ae482cb8dbac74ad16ad60f6a8d9203 289092 openafs-fuse_1.6.10-4_amd64.deb 137963a62cf8dac239640b9301549d9520402aae 203272 openafs-kpasswd_1.6.10-4_amd64.deb 10108dc51dba51b162057b783ef9efb294bba7f7 1340364 openafs-fileserver_1.6.10-4_amd64.deb 4f892aef0162bf7c74801b50bc963b228e703d0c 453522 openafs-dbserver_1.6.10-4_amd64.deb 06cd704d99e4ea29ca01a9c0c714e3283f80cf78 3992476 openafs-doc_1.6.10-4_all.deb f25a1c41e00810c2965259fcdeebb91c1529bc4d 260808 openafs-krb5_1.6.10-4_amd64.deb 108319f136524dc35f6ba6427d8321c2cd5f43c7 92366 libkopenafs1_1.6.10-4_amd64.deb 5319478a0c121acbda5d713f2e67aa43235cd057 215354 libafsauthent1_1.6.10-4_amd64.deb 1dfde51f57712de6332163038a5615c49f1bb4ad 200698 libafsrpc1_1.6.10-4_amd64.deb 272c8e281cec32c613ba08c104137a76362c6eb6 1332598 libopenafs-dev_1.6.10-4_amd64.deb c91549176e801af12d2f154af35ac4129043e973 1154582 openafs-modules-source_1.6.10-4_all.deb 3f82973b5834bba6ce1d4996ac92efb241baecb8 942312 openafs-modules-dkms_1.6.10-4_all.deb dc78d7790acc8ead63a2251529bde21f4f500bd0 191212 libpam-openafs-kaserver_1.6.10-4_amd64.deb e2484def87c0f7186914d007eb4c53b0295d39f0 22411420 openafs-dbg_1.6.10-4_amd64.deb Checksums-Sha256: 284fb20f3df89b0df655679dc07a3fa8f6bb40595523735eb29578b6f33075e2 3798 openafs_1.6.10-4.dsc 2795e8462b97553baf368afa0376edd690fd71b76a0ccd73848db7b0bb586fcd 147672 openafs_1.6.10-4.debian.tar.xz 33748af3d3d4e45f9f7e24809fd622ef71ba0eb6f387d407cc1a117c2dd0946d 1966876 openafs-client_1.6.10-4_amd64.deb 5375463eba3678ca2dcd54410831fbc7dfd49125595e137b303b8fc7b424d23a 289092 openafs-fuse_1.6.10-4_amd64.deb 72eefb29bbdb316e280c73d8d096a6312f94ae09ef1b0ab07978d581818ac37d 203272 openafs-kpasswd_1.6.10-4_amd64.deb e66d613cc4fda1e9b7e68ad092fdfad3a78cad4d2dea727098041587d93778ad 1340364 openafs-fileserver_1.6.10-4_amd64.deb 493138633728345722b6bd608503d364704018af845c3644af2ce8615b0bdb95 453522 openafs-dbserver_1.6.10-4_amd64.deb c98adc7a8566492f62f47c562a3b3e9a6812e36df9a76d3e5e21999c997ea13e 3992476 openafs-doc_1.6.10-4_all.deb 65c9f3c3756eb69d510f466a50ca826db92398b5fc812e99f3a3fe7fb66cbacf 260808 openafs-krb5_1.6.10-4_amd64.deb 4f9cde92d27dce3ca7af12a87fe8e0b6a492dd6e8fd155edcd770903672a3b53 92366 libkopenafs1_1.6.10-4_amd64.deb e797b6d34129b5d149d72ca73ada47a120e202bb1acc5e3fa494ca0a99a585ec 215354 libafsauthent1_1.6.10-4_amd64.deb 1abdb18c11ab35fd4a078c816a5635ff55b98fc4199dc34db961566f3d19ca0d 200698 libafsrpc1_1.6.10-4_amd64.deb 57af0be2544e62ee6a288a5a46c8adeb5429ae16ce2e4a3e44949572a0e3f506 1332598 libopenafs-dev_1.6.10-4_amd64.deb c40b3f769e11063ff2b9a1cf0f6913eb07798e0edb35bddfb91affef300485a8 1154582 openafs-modules-source_1.6.10-4_all.deb 0ce79f5cc26a4e3d9f8e7f5649aa09222750bf661f2a43f422c8097cf15533b4 942312 openafs-modules-dkms_1.6.10-4_all.deb 9d278e2608a1adfb41b94560ab9ea1af6c6a8709196a19054204f49762b54786 191212 libpam-openafs-kaserver_1.6.10-4_amd64.deb d4eb4b68d1308066d12321fc5f7009936b9195015b89f51555abd14c15b7d835 22411420 openafs-dbg_1.6.10-4_amd64.deb Files: 5a8b89ca72daa822152a14dc07ef666c 3798 net optional openafs_1.6.10-4.dsc 44a546088105f9d659d58f1a2d7bd36b 147672 net optional openafs_1.6.10-4.debian.tar.xz 9ef72df646a38e43ff874f3c2e81909b 1966876 net optional openafs-client_1.6.10-4_amd64.deb ef94a39ebf0ff5ca9dace06ff541ad35 289092 net extra openafs-fuse_1.6.10-4_amd64.deb 3443174e425a55d60014ee7ca22066f1 203272 net extra openafs-kpasswd_1.6.10-4_amd64.deb 848191cd1b20de15ac36fda3d5f1dc98 1340364 net optional openafs-fileserver_1.6.10-4_amd64.deb aeeb93f43203a4485e6f8b67108d1d83 453522 net optional openafs-dbserver_1.6.10-4_amd64.deb 850fdd0268f6e0c209c1d24d46eda41d 3992476 doc optional openafs-doc_1.6.10-4_all.deb 02406a7f6414fa5c583ea0ed99f9795e 260808 net optional openafs-krb5_1.6.10-4_amd64.deb 9737b9e4708d96a57b4fc04bcbd0165e 92366 libs optional libkopenafs1_1.6.10-4_amd64.deb 45f1c5f219bd84bebea08f48f7cc0108 215354 libs optional libafsauthent1_1.6.10-4_amd64.deb 3e9766ea3f418866e587383ed9b3a9ba 200698 libs optional libafsrpc1_1.6.10-4_amd64.deb 289773f786e985866d0757af41348999 1332598 libdevel extra libopenafs-dev_1.6.10-4_amd64.deb 92fcd5c07bf117bf5cb14dd8ffd60b0e 1154582 kernel extra openafs-modules-source_1.6.10-4_all.deb fcd8f219880001a57e6d23f6eed860d3 942312 kernel extra openafs-modules-dkms_1.6.10-4_all.deb ced3e4c39d11f357650af3141ea97b55 191212 admin extra libpam-openafs-kaserver_1.6.10-4_amd64.deb 211db4bbf62e22ce8571fdb29eff4920 22411420 debug extra openafs-dbg_1.6.10-4_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQGgBAEBCgAGBQJU0mi0AAoJECjZpvNk63USSCoMH2TLL/6x96X1BT9zQ773MNoh zhQ/mOaA4LyQi5Zr7+8CYqR7fWPS+O/ss7Hxh/IT5hWpq2XQjQBA2gxEUwAH5PLZ s+3JJpyd2HpBltdMDewoyITxBIrLKwMGwO2mXP+niRKrOy/JfRfGvYDWEIRCj0Mn z2cO/iHScpSc2hG3sWvoMXMYYkACLDLH/FcKqEqsl7EAMSYFsES76LdIAfK5rP7F Rw178DSOSbLESM5Rq/2UprpOSXsd6YyHxshNjWhffx/YaU9IJZVQIjQeImTuCODq 29Hv1Zx8nRC5pMFUIZoxWPqxzjuU4LKgMqfhh04HnC7inbdm/m3QluvVESnxgxjh lU/wM3w+1D25eaL7KyB2WdXRQL6uTgLKJISdxoZtEuYirRSo/Rkots84K9IpRpWy AArgOnyJfoGfvBKYeZEGU+VGip55qD/pIeP1vnovYWYlQrtpGKkW80QuGKJdU9IT Uz62erTIAsBsilTh2X9C1WE22ZhE8zj+aEsjZh2OVYpRCfo= =0oSy -----END PGP SIGNATURE-----
--- End Message ---
