This gets rid of most of the patches cherry-picked in for 1.6.10-4.
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Fri, 19 Dec 2014 10:11:53 -0500
-Subject: Unix CM: Avoid using stale DV in afs_StoreAllSegments
-
-It was reported in RT 131976 that on Linux some file
-corruption was observed when doing mmap writes to
-a file substantially larger than the cache size.
-
-osi_VM_StoreAllSegments drops locks and asks the OS to flush
-any dirty pages in the file 's mapping. This will trigger
-calls into our writepage op, and if the number of dirty
-cache chunks is too high (as will happen for a file larger
-than the cache size), afs_DoPartialWrite will recursively
-call afs_StoreAllSegments and some chunks will be written
-back to the server. After potentially doing this several
-times, control will return to the original afs_StoreAllSegments.
-
-At that point the data version that was stored before
-osi_VM_StoreAllSegments is no longer correct, leading to
-possible data corruption.
-
-Triggering this bug requires writing a file larger than the
-cache so that partial stores are done, and writing enough
-data to exceed the system's maximum dirty ratio and cause
-it to initiate writeback.
-
-To fix, just wait until after osi_VM_StoreAllSegments to
-look at and store the data version
-
-FIXES 131976
-
-Reviewed-on: http://gerrit.openafs.org/11644
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
-(cherry picked from commit b22c586bcdf785c489009ab96cbb572181cb9b09)
-
-Change-Id: I32a2f6f32d432fe4a2e21ebd4bb278a9d7e5499f
-Reviewed-on: http://gerrit.openafs.org/11656
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit 013e8db33fbec8b5db4ac5a1ec94a7f5b2afbc45)
----
- src/afs/afs_segments.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/afs/afs_segments.c b/src/afs/afs_segments.c
-index f407b49..1ea3311 100644
---- a/src/afs/afs_segments.c
-+++ b/src/afs/afs_segments.c
-@@ -174,8 +174,6 @@ afs_StoreAllSegments(struct vcache *avc, struct vrequest *areq,
-
- AFS_STATCNT(afs_StoreAllSegments);
-
-- hset(oldDV, avc->f.m.DataVersion);
-- hset(newDV, avc->f.m.DataVersion);
- hash = DVHash(&avc->f.fid);
- foreign = (avc->f.states & CForeign);
- dcList = (struct dcache **)osi_AllocLargeSpace(AFS_LRALLOCSIZ);
-@@ -213,6 +211,14 @@ afs_StoreAllSegments(struct vcache *avc, struct vrequest *areq,
- /*printf("Net down in afs_StoreSegments\n");*/
- return ENETDOWN;
- }
-+
-+ /*
-+ * Can't do this earlier because osi_VM_StoreAllSegments drops locks
-+ * and can indirectly do some stores that increase the DV.
-+ */
-+ hset(oldDV, avc->f.m.DataVersion);
-+ hset(newDV, avc->f.m.DataVersion);
-+
- ConvertWToSLock(&avc->lock);
-
- /*
+++ /dev/null
-From: Andrew Deason <adeason@sinenomine.net>
-Date: Sun, 14 Sep 2014 14:10:11 -0500
-Subject: afs: Fix some afs_conn overcounts
-
-The usual pattern of using afs_Conn looks like this:
-
- do {
- tc = afs_Conn(...);
- if (tc) {
- code = /* ... */
- } else {
- code = -1;
- }
- } while (afs_Analyze(...));
-
-The afs_Analyze call, amongst other things, puts back the reference to
-the connection obtained from afs_Conn. If anything inside the do/while
-block exits that block without calling afs_Analyze or afs_PutConn, we
-will leak a reference to the conn.
-
-A few places currently do this, by jumping out of the loop with
-'goto's. Specifically, in afs_dcache.c and afs_bypasscache.c. These
-locations currently leak references to our connection object (and to
-the underlying Rx connection object), which can cause problems over
-time. Specifically, this can cause a panic when the refcount overflows
-and becomes negative, causing a panic message that looks like:
-
- afs_PutConn: refcount imbalance 0xd34db33f -32768
-
-To avoid this, make sure we afs_PutConn in these cases where we 'goto'
-out of the afs_Conn/afs_Analyze loop. Perhaps ideally we should cause
-afs_Analyze itself to be called in these situations, but for now just
-fix the problem with the least amount of impact possible.
-
-FIXES 131885
-
-Reviewed-on: http://gerrit.openafs.org/11464
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: Benjamin Kaduk <kaduk@mit.edu>
-Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
-(cherry picked from commit 54c0ee608f4afd2b178c9b60eabfc3564293d996)
-
-Change-Id: Ic02ede4f8177863e8079b4a92c9bad492d6dc97b
-Reviewed-on: http://gerrit.openafs.org/11645
-Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit fba39040435afe63b0737945e2269375107fc686)
----
- src/afs/afs_bypasscache.c | 1 +
- src/afs/afs_dcache.c | 7 +++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
-index 744feb2..8fc6009 100644
---- a/src/afs/afs_bypasscache.c
-+++ b/src/afs/afs_bypasscache.c
-@@ -637,6 +637,7 @@ afs_PrefetchNoCache(struct vcache *avc,
- } else {
- afs_warn("BYPASS: StartRXAFS_FetchData failed: %d\n", code);
- unlock_and_release_pages(auio);
-+ afs_PutConn(tc, rxconn, SHARED_LOCK);
- goto done;
- }
- if (code == 0) {
-diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
-index dc1e039..a156e22 100644
---- a/src/afs/afs_dcache.c
-+++ b/src/afs/afs_dcache.c
-@@ -2399,6 +2399,13 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
- afs_PutDCache(tdc);
- tdc = 0;
- ReleaseReadLock(&avc->lock);
-+
-+ if (tc) {
-+ /* If we have a connection, we must put it back,
-+ * since afs_Analyze will not be called here. */
-+ afs_PutConn(tc, rxconn, SHARED_LOCK);
-+ }
-+
- slowPass = 1;
- goto RetryGetDCache;
- }
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Thu, 18 Dec 2014 06:57:22 -0500
-Subject: Linux: Move code to reset the root to afs/LINUX
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-Move the Linux specific bit of code to reset the root to
-afs/LINUX platform specific files. Things that play with
-the Linux vfs internals should not be exposed here.
-
-No functional change, but this helps cleanup some ifdef
-mess.
-
-Reviewed-on: http://gerrit.openafs.org/11641
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-(cherry picked from commit 6ca324e565c34d9d04f3c553b7d0febe675ae538)
-
-Change-Id: I82803669dd34d7abeb29040fbb38ec2f000f2601
-Reviewed-on: http://gerrit.openafs.org/11658
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit a6013738362f4d1487ca57282b2428e3ba962720)
----
- src/afs/LINUX/osi_prototypes.h | 3 ++
- src/afs/LINUX/osi_vcache.c | 61 ++++++++++++++++++++++++++++++++++++
- src/afs/LINUX24/osi_prototypes.h | 3 ++
- src/afs/LINUX24/osi_vcache.c | 36 +++++++++++++++++++++
- src/afs/afs_daemons.c | 67 +++-------------------------------------
- 5 files changed, 108 insertions(+), 62 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_prototypes.h b/src/afs/LINUX/osi_prototypes.h
-index 9002882..1d2ca0d 100644
---- a/src/afs/LINUX/osi_prototypes.h
-+++ b/src/afs/LINUX/osi_prototypes.h
-@@ -79,6 +79,9 @@ extern void osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp);
- extern void osi_VM_Truncate(struct vcache *avc, int alen,
- afs_ucred_t *acred);
-
-+/* osi_vcache.c */
-+extern void osi_ResetRootVCache(afs_uint32 volid);
-+
- /* osi_vfsops.c */
- extern void vattr2inode(struct inode *ip, struct vattr *vp);
- extern int afs_init_inodecache(void);
-diff --git a/src/afs/LINUX/osi_vcache.c b/src/afs/LINUX/osi_vcache.c
-index 1d0db82..391e7d4 100644
---- a/src/afs/LINUX/osi_vcache.c
-+++ b/src/afs/LINUX/osi_vcache.c
-@@ -143,3 +143,64 @@ osi_PostPopulateVCache(struct vcache *avc) {
- vSetType(avc, VREG);
- }
-
-+/**
-+ * osi_ResetRootVCache - Reset the root vcache
-+ * Reset the dentry associated with the afs root.
-+ * Called from afs_CheckRootVolume when we notice that
-+ * the root volume ID has changed.
-+ *
-+ * @volid: volume ID for the afs root
-+ */
-+void
-+osi_ResetRootVCache(afs_uint32 volid)
-+{
-+ struct vrequest *treq = NULL;
-+ struct vattr vattr;
-+ cred_t *credp;
-+ struct dentry *dp;
-+ struct vcache *vcp;
-+ struct inode *root = AFSTOV(afs_globalVp);
-+
-+ afs_rootFid.Fid.Volume = volid;
-+ afs_rootFid.Fid.Vnode = 1;
-+ afs_rootFid.Fid.Unique = 1;
-+
-+ credp = crref();
-+ if (afs_CreateReq(&treq, credp))
-+ goto out;
-+ vcp = afs_GetVCache(&afs_rootFid, treq, NULL, NULL);
-+ if (!vcp)
-+ goto out;
-+ afs_getattr(vcp, &vattr, credp);
-+ afs_fill_inode(AFSTOV(vcp), &vattr);
-+
-+ dp = d_find_alias(root);
-+
-+#if defined(HAVE_DCACHE_LOCK)
-+ spin_lock(&dcache_lock);
-+#else
-+ spin_lock(&AFSTOV(vcp)->i_lock);
-+#endif
-+ spin_lock(&dp->d_lock);
-+#if defined(D_ALIAS_IS_HLIST)
-+ hlist_del_init(&dp->d_alias);
-+ hlist_add_head(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
-+#else
-+ list_del_init(&dp->d_alias);
-+ list_add(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
-+#endif
-+ dp->d_inode = AFSTOV(vcp);
-+ spin_unlock(&dp->d_lock);
-+#if defined(HAVE_DCACHE_LOCK)
-+ spin_unlock(&dcache_lock);
-+#else
-+ spin_unlock(&AFSTOV(vcp)->i_lock);
-+#endif
-+ dput(dp);
-+
-+ AFS_RELE(root);
-+ afs_globalVp = vcp;
-+out:
-+ crfree(credp);
-+ afs_DestroyReq(treq);
-+}
-diff --git a/src/afs/LINUX24/osi_prototypes.h b/src/afs/LINUX24/osi_prototypes.h
-index ad2522c..39d6402 100644
---- a/src/afs/LINUX24/osi_prototypes.h
-+++ b/src/afs/LINUX24/osi_prototypes.h
-@@ -69,6 +69,9 @@ extern void osi_syscall_clean(void);
- extern int osi_sysctl_init(void);
- extern void osi_sysctl_clean(void);
-
-+/* osi_vcache.c */
-+extern void osi_ResetRootVCache(afs_uint32 volid);
-+
- /* osi_vm.c */
- extern int osi_VM_FlushVCache(struct vcache *avc, int *slept);
- extern void osi_VM_TryToSmush(struct vcache *avc, afs_ucred_t *acred,
-diff --git a/src/afs/LINUX24/osi_vcache.c b/src/afs/LINUX24/osi_vcache.c
-index bbaf5ce..853a357 100644
---- a/src/afs/LINUX24/osi_vcache.c
-+++ b/src/afs/LINUX24/osi_vcache.c
-@@ -119,3 +119,39 @@ osi_PostPopulateVCache(struct vcache *avc) {
- vSetType(avc, VREG);
- }
-
-+void
-+osi_ResetRootVCache(afs_uint32 volid)
-+{
-+ struct vrequest *treq = NULL;
-+ struct vattr vattr;
-+ cred_t *credp;
-+ struct dentry *dp;
-+ struct vcache *vcp;
-+
-+ afs_rootFid.Fid.Volume = volid;
-+ afs_rootFid.Fid.Vnode = 1;
-+ afs_rootFid.Fid.Unique = 1;
-+
-+ credp = crref();
-+ if (afs_CreateReq(&treq, credp))
-+ goto out;
-+ vcp = afs_GetVCache(&afs_rootFid, treq, NULL, NULL);
-+ if (!vcp)
-+ goto out;
-+ afs_getattr(vcp, &vattr, credp);
-+ afs_fill_inode(AFSTOV(vcp), &vattr);
-+
-+ dp = d_find_alias(AFSTOV(afs_globalVp));
-+ spin_lock(&dcache_lock);
-+ list_del_init(&dp->d_alias);
-+ list_add(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
-+ dp->d_inode = AFSTOV(vcp);
-+ spin_unlock(&dcache_lock);
-+ dput(dp);
-+
-+ AFS_FAST_RELE(afs_globalVp);
-+ afs_globalVp = vcp;
-+out:
-+ crfree(credp);
-+ afs_DestroyReq(treq);
-+}
-diff --git a/src/afs/afs_daemons.c b/src/afs/afs_daemons.c
-index 8e5f6ad..c26cdee 100644
---- a/src/afs/afs_daemons.c
-+++ b/src/afs/afs_daemons.c
-@@ -363,71 +363,14 @@ afs_CheckRootVolume(void)
- * count to zero and fs checkv is executed when the current
- * directory is /afs.
- */
--#ifdef AFS_LINUX20_ENV
-- {
-- struct vrequest *treq = NULL;
-- struct vattr vattr;
-- cred_t *credp;
-- struct dentry *dp;
-- struct vcache *vcp;
--
-- afs_rootFid.Fid.Volume = volid;
-- afs_rootFid.Fid.Vnode = 1;
-- afs_rootFid.Fid.Unique = 1;
--
-- credp = crref();
-- if (afs_CreateReq(&treq, credp))
-- goto out;
-- vcp = afs_GetVCache(&afs_rootFid, treq, NULL, NULL);
-- if (!vcp)
-- goto out;
-- afs_getattr(vcp, &vattr, credp);
-- afs_fill_inode(AFSTOV(vcp), &vattr);
--
-- dp = d_find_alias(AFSTOV(afs_globalVp));
--
--#if defined(AFS_LINUX24_ENV)
--#if defined(HAVE_DCACHE_LOCK)
-- spin_lock(&dcache_lock);
--#else
-- spin_lock(&AFSTOV(vcp)->i_lock);
--#endif
--#if defined(AFS_LINUX26_ENV)
-- spin_lock(&dp->d_lock);
--#endif
--#endif
--#if defined(D_ALIAS_IS_HLIST)
-- hlist_del_init(&dp->d_alias);
-- hlist_add_head(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
--#else
-- list_del_init(&dp->d_alias);
-- list_add(&dp->d_alias, &(AFSTOV(vcp)->i_dentry));
--#endif
-- dp->d_inode = AFSTOV(vcp);
--#if defined(AFS_LINUX24_ENV)
--#if defined(AFS_LINUX26_ENV)
-- spin_unlock(&dp->d_lock);
--#endif
--#if defined(HAVE_DCACHE_LOCK)
-- spin_unlock(&dcache_lock);
--#else
-- spin_unlock(&AFSTOV(vcp)->i_lock);
--#endif
--#endif
-- dput(dp);
--
-- AFS_FAST_RELE(afs_globalVp);
-- afs_globalVp = vcp;
-- out:
-- crfree(credp);
-- afs_DestroyReq(treq);
-- }
-+#ifdef AFS_LINUX22_ENV
-+ osi_ResetRootVCache(volid);
- #else
--#ifdef AFS_DARWIN80_ENV
-+# ifdef AFS_DARWIN80_ENV
- afs_PutVCache(afs_globalVp);
--#else
-+# else
- AFS_FAST_RELE(afs_globalVp);
--#endif
-+# endif
- afs_globalVp = 0;
- #endif
- }
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Thu, 18 Dec 2014 07:13:46 -0500
-Subject: Linux: d_alias becomes d_u.d_alias
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-The fields in struct dentry are re-arranged so that d_alias
-shares space wth d_rcu inside the d_u union. Some references
-need to change from d_alias to d_u.d_alias.
-
-The kernel change was introduced for 3.19 but was also backported
-to the 3.18 stable series in 3.18.1, so this commit is required
-for 3.19 and current 3.18 kernels.
-
-Reviewed-on: http://gerrit.openafs.org/11642
-Reviewed-by: Anders Kaseorg <andersk@mit.edu>
-Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit d6f29679098aff171e69511823b340ccf28e5c31)
-
-Change-Id: Ifb6199aa7fa922e64540d9fad1d2d79facbb9761
-Reviewed-on: http://gerrit.openafs.org/11659
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit 860764da5ee2e48a2c3f7552fad1766e19eae47f)
----
- acinclude.m4 | 1 +
- src/afs/LINUX/osi_compat.h | 4 ++++
- src/cf/linux-test4.m4 | 9 ++++++++-
- 3 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index d324dc1..fa429c7 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -828,6 +828,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- [backing-dev.h])
- AC_CHECK_LINUX_STRUCT([cred], [session_keyring], [cred.h])
- AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
-+ AC_CHECK_LINUX_STRUCT([dentry], [d_u.d_alias], [dcache.h])
- AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_blkbits], [fs.h])
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index 26673a7..b98e980 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -37,6 +37,10 @@ typedef struct vfs_path afs_linux_path_t;
- typedef struct path afs_linux_path_t;
- #endif
-
-+#if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
-+# define d_alias d_u.d_alias
-+#endif
-+
- #ifndef HAVE_LINUX_DO_SYNC_READ
- static inline int
- do_sync_read(struct file *fp, char *buf, size_t count, loff_t *offp) {
-diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
-index 34c5d4d..5f5ec5c 100644
---- a/src/cf/linux-test4.m4
-+++ b/src/cf/linux-test4.m4
-@@ -723,7 +723,11 @@ AC_DEFUN([LINUX_D_ALIAS_IS_HLIST], [
- [#include <linux/fs.h>],
- [struct dentry *d = NULL;
- struct hlist_node *hn = NULL;
-- d->d_alias = *hn;],
-+ #if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
-+ d->d_u.d_alias = *hn;
-+ #else
-+ d->d_alias = *hn;
-+ #endif],
- [D_ALIAS_IS_HLIST],
- [define if dentry->d_alias is an hlist],
- [])
-@@ -737,6 +741,9 @@ AC_DEFUN([LINUX_HLIST_ITERATOR_NO_NODE], [
- #include <linux/fs.h>],
- [struct dentry *d = NULL, *cur;
- struct inode *ip;
-+ #if defined(STRUCT_DENTRY_HAS_D_U_D_ALIAS)
-+ # define d_alias d_u.d_alias
-+ #endif
- hlist_for_each_entry(cur, &ip->i_dentry, d_alias) { }
- ],
- [HLIST_ITERATOR_NO_NODE],
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Mon, 5 Jan 2015 07:03:16 -0500
-Subject: Linux 3.19: No more f_dentry
-
-Back in kernel 2.6 .20 struct file lost its f_dentry field
-which was replaced by f_path.To ease transition f_dentry
-was defined as f_dpath.dentry in the same header.This
-define finally gets removed with kernel 3.19.
-
-Keep using f_dentry in the code, but add a configure test
-for the presence of f_path and the absence of the f_dentry
-macro so we can add it if its missing.
-
-Change - Id:I8e8a7e4d3ddd861018de50af1eb7315e730ad529
-
-Reviewed-on: http://gerrit.openafs.org/11646
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit f9ca302b7a10ffc36f2439e068333ab147791c5a)
-
-Change-Id: I179bf2fbc22e824e40c60c59e5d223d49343e7a5
-Reviewed-on: http://gerrit.openafs.org/11660
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit 7ba61dfa6cedc4e6e106bd2079e564e554720d7e)
----
- acinclude.m4 | 1 +
- src/afs/LINUX/osi_compat.h | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index fa429c7..d2bb3b7 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -835,6 +835,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_STRUCT([inode], [i_blksize], [fs.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_mutex], [fs.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
-+ AC_CHECK_LINUX_STRUCT([file], [f_path], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_operations], [read_iter], [fs.h])
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index b98e980..53b78b7 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -41,6 +41,12 @@ typedef struct path afs_linux_path_t;
- # define d_alias d_u.d_alias
- #endif
-
-+#if defined(STRUCT_FILE_HAS_F_PATH)
-+# if !defined(f_dentry)
-+# define f_dentry f_path.dentry
-+# endif
-+#endif
-+
- #ifndef HAVE_LINUX_DO_SYNC_READ
- static inline int
- do_sync_read(struct file *fp, char *buf, size_t count, loff_t *offp) {
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Mon, 5 Jan 2015 07:13:37 -0500
-Subject: Linux 3.19: Use mgs_iter in struct msghdr
-
-struct msghdr gets msg_iov replaced by msg_iter. Add a configure
-test and adjust the affected code.
-
-Reviewed-on: http://gerrit.openafs.org/11647
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit ec9a7c2db833efacfd0692c658c2d38ed9f852ba)
-
-Change-Id: I9d873626d8997922aacf67a5a9ce7621ed904faa
-Reviewed-on: http://gerrit.openafs.org/11661
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit 78e8cce68d11e895140b0b03894ffdd62699ffbc)
----
- acinclude.m4 | 1 +
- src/rx/LINUX/rx_knet.c | 5 +++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index d2bb3b7..46d1215 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -845,6 +845,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_STRUCT([key_type], [instantiate_prep], [key-type.h])
- AC_CHECK_LINUX_STRUCT([key_type], [match_preparse], [key-type.h])
- AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
-+ AC_CHECK_LINUX_STRUCT([msghdr], [msg_iter], [socket.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])
-diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c
-index cb7034e..3f7f2bc 100644
---- a/src/rx/LINUX/rx_knet.c
-+++ b/src/rx/LINUX/rx_knet.c
-@@ -229,8 +229,13 @@ osi_NetReceive(osi_socket so, struct sockaddr_in *from, struct iovec *iov,
- #endif
- memcpy(tmpvec, iov, iovcnt * sizeof(struct iovec));
- msg.msg_name = from;
-+#if defined(STRUCT_MSGHDR_HAS_MSG_ITER)
-+ msg.msg_iter.iov = tmpvec;
-+ msg.msg_iter.nr_segs = iovcnt;
-+#else
- msg.msg_iov = tmpvec;
- msg.msg_iovlen = iovcnt;
-+#endif
- msg.msg_control = NULL;
- msg.msg_controllen = 0;
- msg.msg_flags = 0;
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Mon, 5 Jan 2015 07:17:14 -0500
-Subject: Linux 3.19: struct nameidata becomes opaque
-
-With kernel 3.19 struct nameidata becomes opaque. As a result
-we cannot rely on STRUCT_NAMEIDATA_HAS_PATH being true for
-new kernels.
-
-Rework the conditions here so that STRUCT_NAMEIDATA_HAS_PATH
-is only tested when we're using a nameidata structure and
-the result matters.
-
-Also modify a configure test to use a nameidata pointer
-instead of an actual structure.
-
-Reviewed-on: http://gerrit.openafs.org/11648
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-(cherry picked from commit 72e22eb00f641f137f7dbe4195d6d82f4a8addc9)
-
-Change-Id: Ia794d9006a054d16a3b9e5b8ced55c798244d4c7
-Reviewed-on: http://gerrit.openafs.org/11662
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Daria Brashear <shadow@your-file-system.com>
-Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
-(cherry picked from commit 3da7b86c4ac998640b0b7ffd0e01613449d72e30)
----
- src/afs/LINUX/osi_compat.h | 16 ++++++++--------
- src/cf/linux-test4.m4 | 4 ++--
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index 53b78b7..c1cdb19 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -475,23 +475,23 @@ afs_get_dentry_ref(struct nameidata *nd, struct vfsmount **mnt, struct dentry **
- #else
- afs_get_dentry_ref(afs_linux_path_t *path, struct vfsmount **mnt, struct dentry **dpp) {
- #endif
--#if defined(STRUCT_NAMEIDATA_HAS_PATH)
--# if defined(HAVE_LINUX_PATH_LOOKUP)
-+#if defined(HAVE_LINUX_PATH_LOOKUP)
-+# if defined(STRUCT_NAMEIDATA_HAS_PATH)
- *dpp = dget(nd->path.dentry);
- if (mnt)
- *mnt = mntget(nd->path.mnt);
- path_put(&nd->path);
- # else
-- *dpp = dget(path->dentry);
-- if (mnt)
-- *mnt = mntget(path->mnt);
-- path_put(path);
--# endif
--#else
- *dpp = dget(nd->dentry);
- if (mnt)
- *mnt = mntget(nd->mnt);
- path_release(nd);
-+# endif
-+#else
-+ *dpp = dget(path->dentry);
-+ if (mnt)
-+ *mnt = mntget(path->mnt);
-+ path_put(path);
- #endif
- }
-
-diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
-index 5f5ec5c..604d380 100644
---- a/src/cf/linux-test4.m4
-+++ b/src/cf/linux-test4.m4
-@@ -278,9 +278,9 @@ AC_DEFUN([LINUX_IOP_I_PUT_LINK_TAKES_COOKIE], [
- #include <linux/namei.h>],
- [struct inode _inode;
- struct dentry _dentry;
--struct nameidata _nameidata;
-+struct nameidata *_nameidata;
- void *cookie;
--(void)_inode.i_op->put_link(&_dentry, &_nameidata, cookie);],
-+(void)_inode.i_op->put_link(&_dentry, _nameidata, cookie);],
- [IOP_PUT_LINK_TAKES_COOKIE],
- [define if your iops.put_link takes a cookie],
- [])
+++ /dev/null
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Thu, 18 Dec 2014 08:43:22 -0500
-Subject: Linux: d_splice_alias may drop inode reference on error
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-d_splice_alias now drops the inode reference on error, so we
-need to grab an extra one to make sure that the inode doesn't
-go away, and release it when done if there was no error.
-
-For kernels that may not drop the reference, provide an
-additional iput() within an ifdef. This could be hooked up
-to a configure option to allow building a module for a kernel
-that is known not to drop the reference on error. That hook
-is not provided here. Affected kernels should be the early
-3.17 ones (3.17 - 3.17.2); 3.16 and older kernels should not
-return errors here.
-
-[kaduk@mit.edu add configure option to control behavior, which
-is mandatory on non-buildbot linux systems]
-
-Reviewed-on: http://gerrit.openafs.org/11643
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Michael Laß <lass@mail.uni-paderborn.de>
-Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
-(cherry picked from commit 15260c7fdc5ac8fe9fb1797c8e383c665e9e0ccd)
-
-Change-Id: I288eb66c38386fcd6bae0da111d97e211cc5c995
-(cherry picked from commit 33856e051b1eae40544c23fd88eb21801aef98bb)
----
- acinclude.m4 | 26 ++++++++++++++++++++++++++
- src/afs/LINUX/osi_vnodeops.c | 29 ++++++++++++++++++++++++++---
- 2 files changed, 52 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 46d1215..2e7b0ed 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -232,6 +232,26 @@ AC_ARG_ENABLE([linux-syscall-probing],
- ,
- [enable_linux_syscall_probing="maybe"])
-
-+AC_ARG_ENABLE([linux-d_splice_alias-extra-iput],
-+ [AS_HELP_STRING([--enable-linux-d_splice_alias-extra-iput],
-+ [Linux has introduced an incompatible behavior change in the
-+ d_splice_alias function with no reliable way to determine which
-+ behavior will be produced. If Linux commit
-+ 51486b900ee92856b977eacfc5bfbe6565028070 (or equivalent) has been
-+ applied to your kernel, disable this option. If that commit is
-+ not present in your kernel, enable this option. We apologize
-+ that you are required to know this about your running kernel.])],
-+ [],
-+ [case $system in
-+ *-linux*)
-+ AS_IF([test "x$LOGNAME" != "xbuildslave" &&
-+ test "x$LOGNAME" != "xbuildbot"],
-+ [AC_ERROR([Linux users must specify either
-+ --enable-linux-d_splice_alias-extra-iput or
-+ --disable-linux-d_splice_alias-extra-iput])],
-+ [enable_linux_d_splice_alias_extra_iput="no"])
-+ esac
-+ ])
- AC_ARG_WITH([xslt-processor],
- AS_HELP_STRING([--with-xslt-processor=ARG],
- [which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]),
-@@ -916,6 +936,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_FUNC([hlist_unhashed],
- [#include <linux/list.h>],
- [hlist_unhashed(0);])
-+ AC_CHECK_LINUX_FUNC([ihold],
-+ [#include <linux/fs.h>],
-+ [ihold(NULL);])
- AC_CHECK_LINUX_FUNC([i_size_read],
- [#include <linux/fs.h>],
- [i_size_read(NULL);])
-@@ -1107,6 +1130,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- fi
- :
- fi
-+ if test "x$enable_linux_d_splice_alias_extra_iput" = xyes; then
-+ AC_DEFINE(D_SPLICE_ALIAS_LEAK_ON_ERROR, 1, [for internal use])
-+ fi
- dnl Linux-only, but just enable always.
- AC_DEFINE(AFS_CACHE_BYPASS, 1, [define to activate cache bypassing Unix client])
- esac
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 9a164ea..760c9b8 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1549,6 +1549,17 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
- ip->i_flags |= S_AUTOMOUNT;
- #endif
- }
-+ /*
-+ * Take an extra reference so the inode doesn't go away if
-+ * d_splice_alias drops our reference on error.
-+ */
-+ if (ip)
-+#ifdef HAVE_LINUX_IHOLD
-+ ihold(ip);
-+#else
-+ igrab(ip);
-+#endif
-+
- newdp = d_splice_alias(ip, dp);
-
- done:
-@@ -1562,14 +1573,26 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
- * d_splice_alias can return an error (EIO) if there is an existing
- * connected directory alias for this dentry.
- */
-- if (!IS_ERR(newdp))
-+ if (!IS_ERR(newdp)) {
-+ iput(ip);
- return newdp;
-- else {
-+ } else {
- d_add(dp, ip);
-+ /*
-+ * Depending on the kernel version, d_splice_alias may or may
-+ * not drop the inode reference on error. If it didn't, do it
-+ * here.
-+ */
-+#if defined(D_SPLICE_ALIAS_LEAK_ON_ERROR)
-+ iput(ip);
-+#endif
- return NULL;
- }
-- } else
-+ } else {
-+ if (ip)
-+ iput(ip);
- return ERR_PTR(afs_convert_code(code));
-+ }
- }
-
- static int
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
-0011-Unix-CM-Avoid-using-stale-DV-in-afs_StoreAllSegments.patch
-0012-afs-Fix-some-afs_conn-overcounts.patch
-0013-Linux-Move-code-to-reset-the-root-to-afs-LINUX.patch
-0014-Linux-d_alias-becomes-d_u.d_alias.patch
-0015-Linux-3.19-No-more-f_dentry.patch
-0016-Linux-3.19-Use-mgs_iter-in-struct-msghdr.patch
-0017-Linux-3.19-struct-nameidata-becomes-opaque.patch
-0018-Linux-d_splice_alias-may-drop-inode-reference-on-err.patch
projects / packages / o / openafs.git / commitdiff