Changeset 2659


Ignore:
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:
1 added
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/common/patches/openafs-afs_conn-overcounts.patch

    r2649 r2659  
    1 From 368fff3b2fef5b559ed6da016e1e9f0413b55552 Mon Sep 17 00:00:00 2001
     1From 54c0ee608f4afd2b178c9b60eabfc3564293d996 Mon Sep 17 00:00:00 2001
    22From: Andrew Deason <adeason@sinenomine.net>
    33Date: Sun, 14 Sep 2014 14:10:11 -0500
     
    3737
    3838Change-Id: I3a52f8ccef24f01d04c02db0a4b711405360e323
     39Reviewed-on: http://gerrit.openafs.org/11464
     40Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
     41Reviewed-by: Daria Brashear <shadow@your-file-system.com>
     42Tested-by: Benjamin Kaduk <kaduk@mit.edu>
     43Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
    3944---
    4045 src/afs/afs_bypasscache.c | 1 +
     
    4348
    4449diff --git a/src/afs/afs_bypasscache.c b/src/afs/afs_bypasscache.c
    45 index 744feb2..8fc6009 100644
     50index f452638..4c6fb9a 100644
    4651--- a/src/afs/afs_bypasscache.c
    4752+++ b/src/afs/afs_bypasscache.c
    48 @@ -637,6 +637,7 @@ afs_PrefetchNoCache(struct vcache *avc,
     53@@ -621,6 +621,7 @@ afs_PrefetchNoCache(struct vcache *avc,
    4954            } else {
    5055                afs_warn("BYPASS: StartRXAFS_FetchData failed: %d\n", code);
     
    5560            if (code == 0) {
    5661diff --git a/src/afs/afs_dcache.c b/src/afs/afs_dcache.c
    57 index dc1e039..a156e22 100644
     62index 4a9edbd..338e8db 100644
    5863--- a/src/afs/afs_dcache.c
    5964+++ b/src/afs/afs_dcache.c
    60 @@ -2399,6 +2399,13 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
     65@@ -2398,6 +2398,13 @@ afs_GetDCache(struct vcache *avc, afs_size_t abyte,
    6166                        afs_PutDCache(tdc);
    6267                        tdc = 0;
     
    7378                    }
    7479--
    75 2.2.0
     802.2.1
    7681
  • trunk/server/common/patches/openafs-d_splice_alias-reference.patch

    r2655 r2659  
    1 From 1c576fdf9f05c6af7b5b029ba010a76bed48488e Mon Sep 17 00:00:00 2001
     1From b1f23baecb2de72b44cda8bba27615c012a445f1 Mon Sep 17 00:00:00 2001
    22From: Marc Dionne <marc.dionne@your-file-system.com>
    33Date: Thu, 18 Dec 2014 08:43:22 -0500
     
    1818Change-Id: Id1786ac2227b4d8e0ae801fe59c15a0ecd975bed
    1919---
    20  src/afs/LINUX/osi_vnodeops.c | 25 ++++++++++++++++++++++---
    21  1 file changed, 22 insertions(+), 3 deletions(-)
     20 acinclude.m4                 |  3 +++
     21 src/afs/LINUX/osi_vnodeops.c | 29 ++++++++++++++++++++++++++---
     22 2 files changed, 29 insertions(+), 3 deletions(-)
    2223
     24diff --git a/acinclude.m4 b/acinclude.m4
     25index 96adde0..19f7092 100644
     26--- a/acinclude.m4
     27+++ b/acinclude.m4
     28@@ -984,6 +984,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
     29                 AC_CHECK_LINUX_FUNC([hlist_unhashed],
     30                                     [#include <linux/list.h>],
     31                                     [hlist_unhashed(0);])
     32+                AC_CHECK_LINUX_FUNC([ihold],
     33+                                    [#include <linux/fs.h>],
     34+                                    [ihold(NULL);])
     35                 AC_CHECK_LINUX_FUNC([i_size_read],
     36                                     [#include <linux/fs.h>],
     37                                     [i_size_read(NULL);])
    2338diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
    24 index b2ab9d5..3723cf8 100644
     39index b2ab9d5..cedfef6 100644
    2540--- a/src/afs/LINUX/osi_vnodeops.c
    2641+++ b/src/afs/LINUX/osi_vnodeops.c
    27 @@ -1612,6 +1612,13 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
     42@@ -1612,6 +1612,17 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
    2843        ip->i_flags |= S_AUTOMOUNT;
    2944 #endif
     
    3449+     */
    3550+    if (ip)
     51+#ifdef HAVE_LINUX_IHOLD
     52+       ihold(ip);
     53+#else
    3654+       igrab(ip);
     55+#endif
    3756+
    3857     newdp = d_splice_alias(ip, dp);
    3958 
    4059  done:
    41 @@ -1625,14 +1632,26 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
     60@@ -1625,14 +1636,26 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
    4261         * d_splice_alias can return an error (EIO) if there is an existing
    4362         * connected directory alias for this dentry.
  • trunk/server/fedora/Makefile

    r2637 r2659  
    4141
    4242dload           = ${PWD}/.dload
    43 openafs_url     = "https://www.openafs.org/dl/openafs/1.6.10/openafs-1.6.10-2.src.rpm"
     43openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre1/openafs-1.6.11-0.pre1.src.rpm"
    4444#zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4545
  • trunk/server/fedora/specs/openafs.spec.patch

    r2655 r2659  
    22+++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.10
     4 %define pkgvers 1.6.11
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
    7 -%define pkgrel 2
    8 +%define pkgrel 2.99.scripts.%{scriptsversion}
     7-%define pkgrel 0.pre1
     8+%define pkgrel 0.pre1.99.scripts.%{scriptsversion}
    99 
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,21 @@
     12@@ -249,9 +249,18 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
     
    1919 
    2020+Patch1000: openafs-scripts.patch
    21 +Patch1002: openafs-systemd-crond.patch
    2221+Patch1003: openafs-systemd-csdb.patch
    23 +Patch1004: openafs-afs_lookup-return.patch
    24 +Patch1005: openafs-d_revalidate-mtpt.patch
    25 +Patch1006: openafs-linux-3.17.patch
    2622+Patch1007: openafs-mvid-NULL-deref.patch
    2723+Patch1008: openafs-afs_conn-overcounts.patch
    2824+Patch1009: openafs-d_splice_alias-reference.patch
     25+Patch1010: openafs-d_u.d_alias.patch
    2926+%define _default_patch_fuzz 2
    3027+
     
    9794 %else
    9895 
    99 @@ -698,6 +712,17 @@
     96@@ -698,6 +712,14 @@
    10097 #%setup -q -n %{srcdir}
    10198 %setup -q -b 1 -n %{srcdir}
     
    103100+# Apply the Scripts patch
    104101+%patch1000 -p1 -b .scripts
    105 +%patch1002 -p1 -b .systemd-crond
    106102+%patch1003 -p1 -b .systemd-csdb
    107 +%patch1004 -p1 -b .afs_lookup-return
    108 +%patch1005 -p1 -b .d_revalidate-mtpt
    109 +%patch1006 -p1 -b .linux-3.17
    110103+%patch1007 -p1 -b .mvid-NULL-deref.patch
    111104+%patch1008 -p1 -b .afs_conn-overcounts.patch
    112105+%patch1009 -p1 -b .d_splice_alias-reference
     106+%patch1010 -p1 -b .d_u.d_alias
    113107+
    114108 ##############################################################################
Note: See TracChangeset for help on using the changeset viewer.