Changeset 2659 for trunk/server

Timestamp:

Dec 22, 2014, 12:07:50 AM (8 years ago)

Author:

andersk

Message:

OpenAFS: upgrade to 1.6.11pre1, plus patch for d_alias change

Location:

trunk/server

Files:

• common/patches/openafs-afs_conn-overcounts.patch (modified) (5 diffs)
• common/patches/openafs-afs_lookup-return.patch (deleted)
• common/patches/openafs-d_revalidate-mtpt.patch (deleted)
• common/patches/openafs-d_splice_alias-reference.patch (modified) (3 diffs)
• common/patches/openafs-d_u.d_alias.patch (added)
• common/patches/openafs-linux-3.17.patch (deleted)
• common/patches/openafs-systemd-crond.patch (deleted)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/openafs.spec.patch (modified) (4 diffs)

trunk/server/common/patches/openafs-afs_conn-overcounts.patch

@@ -1 @@
-From 368fff3b2fef5b559ed6da016e1e9f0413b55552 Mon Sep 17 00:00:00 2001
+From 54c0ee608f4afd2b178c9b60eabfc3564293d996 Mon Sep 17 00:00:00 2001
 From: Andrew Deason <adeason@sinenomine.net>
 Date: Sun, 14 Sep 2014 14:10:11 -0500
@@ -37 +37 @@
 
 Change-Id: I3a52f8ccef24f01d04c02db0a4b711405360e323
+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>
 ---
  src/afs/afs_bypasscache.c | 1 +
@@ -43 +48 @@
 
 diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
-index 744feb2..8fc6009 100644
+index f452638..4c6fb9a 100644
 --- a/src/afs/afs_bypasscache.c
 +++ b/src/afs/afs_bypasscache.c
-@@ -637,6 +637,7 @@ afs_PrefetchNoCache(struct vcache *avc,
+@@ -621,6 +621,7 @@ afs_PrefetchNoCache(struct vcache *avc,
             } else {
                 afs_warn("BYPASS: StartRXAFS_FetchData failed: %d\n", code);
@@ -55 +60 @@
             if (code == 0) {
 diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
-index dc1e039..a156e22 100644
+index 4a9edbd..338e8db 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,
+@@ -2398,6 +2398,13 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
                         afs_PutDCache(tdc);
                         tdc = 0;
@@ -73 +78 @@
                     }
 -- 
-2.2.0
+2.2.1
 

trunk/server/common/patches/openafs-d_splice_alias-reference.patch

@@ -1 @@
-From 1c576fdf9f05c6af7b5b029ba010a76bed48488e Mon Sep 17 00:00:00 2001
+From b1f23baecb2de72b44cda8bba27615c012a445f1 Mon Sep 17 00:00:00 2001
 From: Marc Dionne <marc.dionne@your-file-system.com>
 Date: Thu, 18 Dec 2014 08:43:22 -0500
@@ -18 +18 @@
 Change-Id: Id1786ac2227b4d8e0ae801fe59c15a0ecd975bed
 ---
- src/afs/LINUX/osi_vnodeops.c | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
+ acinclude.m4                 |  3 +++
+ src/afs/LINUX/osi_vnodeops.c | 29 ++++++++++++++++++++++++++---
+ 2 files changed, 29 insertions(+), 3 deletions(-)
 
+diff --git a/acinclude.m4 b/acinclude.m4
+index 96adde0..19f7092 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -984,6 +984,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);])
 diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index b2ab9d5..3723cf8 100644
+index b2ab9d5..cedfef6 100644
 --- a/src/afs/LINUX/osi_vnodeops.c
 +++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1612,6 +1612,13 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
+@@ -1612,6 +1612,17 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
         ip->i_flags |= S_AUTOMOUNT;
  #endif
@@ -34 +49 @@
 +     */
 +    if (ip)
++#ifdef HAVE_LINUX_IHOLD
++       ihold(ip);
++#else
 +       igrab(ip);
++#endif
 +
      newdp = d_splice_alias(ip, dp);
  
   done:
-@@ -1625,14 +1632,26 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
+@@ -1625,14 +1636,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.

trunk/server/fedora/Makefile

@@ -41 +41 @@
 
 dload           = ${PWD}/.dload
-openafs_url     = "https://www.openafs.org/dl/openafs/1.6.10/openafs-1.6.10-2.src.rpm"
+openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre1/openafs-1.6.11-0.pre1.src.rpm"
 #zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 

trunk/server/fedora/specs/openafs.spec.patch

@@ -2 +2 @@
 +++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.10
+ %define pkgvers 1.6.11
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 2
-+%define pkgrel 2.99.scripts.%{scriptsversion}
+-%define pkgrel 0.pre1
++%define pkgrel 0.pre1.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,21 @@
+@@ -249,9 +249,18 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -19 +19 @@
  
 +Patch1000: openafs-scripts.patch
-+Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-afs_lookup-return.patch
-+Patch1005: openafs-d_revalidate-mtpt.patch
-+Patch1006: openafs-linux-3.17.patch
 +Patch1007: openafs-mvid-NULL-deref.patch
 +Patch1008: openafs-afs_conn-overcounts.patch
 +Patch1009: openafs-d_splice_alias-reference.patch
++Patch1010: openafs-d_u.d_alias.patch
 +%define _default_patch_fuzz 2
 +
@@ -97 +94 @@
  %else
  
-@@ -698,6 +712,17 @@
+@@ -698,6 +712,14 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -103 +100 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
-+%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .afs_lookup-return
-+%patch1005 -p1 -b .d_revalidate-mtpt
-+%patch1006 -p1 -b .linux-3.17
 +%patch1007 -p1 -b .mvid-NULL-deref.patch
 +%patch1008 -p1 -b .afs_conn-overcounts.patch
 +%patch1009 -p1 -b .d_splice_alias-reference
++%patch1010 -p1 -b .d_u.d_alias
 +
  ##############################################################################