Changeset 2712 for trunk/server/common


Ignore:
Timestamp:
Jul 13, 2015, 10:13:40 PM (9 years ago)
Author:
andersk
Message:
Update OpenAFS to 1.6.12
File:
1 edited

Legend:

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

    r2591 r2712  
    4646#
    4747diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
    48 index 03caf1c..699b2ce 100644
     48index 91c09ed..86e2f26 100644
    4949--- a/src/afs/LINUX/osi_vnodeops.c
    5050+++ b/src/afs/LINUX/osi_vnodeops.c
    51 @@ -1207,6 +1207,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
     51@@ -1296,6 +1296,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
    5252        /* should we always update the attributes at this point? */
    5353        /* unlikely--the vcache entry hasn't changed */
     
    7979 #ifdef notyet
    8080diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
    81 index feb0ca7..ba818c7 100644
     81index 0087073..df3e4ef 100644
    8282--- a/src/afs/VNOPS/afs_vnop_access.c
    8383+++ b/src/afs/VNOPS/afs_vnop_access.c
     
    119119 }
    120120diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
    121 index d01aff2..0a38c1c 100644
     121index 2eb228f..d5d6e4a 100644
    122122--- a/src/afs/VNOPS/afs_vnop_attrs.c
    123123+++ b/src/afs/VNOPS/afs_vnop_attrs.c
    124 @@ -88,8 +88,8 @@ afs_CopyOutAttrs(struct vcache *avc, struct vattr *attrs)
     124@@ -90,8 +90,8 @@ afs_CopyOutAttrs(struct vcache *avc, struct vattr *attrs)
    125125        }
    126126     }
     
    134134 #elif defined(AFS_DARWIN80_ENV)
    135135diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
    136 index 5d96f75..7957eee 100644
     136index d8205b6..5010486 100644
    137137--- a/src/afs/VNOPS/afs_vnop_lookup.c
    138138+++ b/src/afs/VNOPS/afs_vnop_lookup.c
     
    151151        osi_FreeLargeSpace(tname);
    152152diff --git a/src/afs/afs.h b/src/afs/afs.h
    153 index 88d5f77..61d3ee9 100644
     153index 0dbc11b..ab6c0d9 100644
    154154--- a/src/afs/afs.h
    155155+++ b/src/afs/afs.h
    156 @@ -233,8 +233,16 @@ struct afs_slotlist {
     156@@ -237,8 +237,16 @@ struct afs_slotlist {
    157157     struct afs_slotlist *next;
    158158 };
     
    171171     afs_int32 flags;           /* things like O_SYNC, O_NONBLOCK go here */
    172172     char initd;                        /* if non-zero, Error fields meaningful */
    173 @@ -896,6 +904,7 @@ struct vcache {
    174      struct afs_q multiPage;    /* list of multiPage_range structs */
     173@@ -902,6 +910,7 @@ struct vcache {
     174     spinlock_t pagewriter_lock;
     175     struct list_head pagewriters;      /* threads that are writing vm pages */
    175176 #endif
    176      afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */
    177177+    int apache_access;         /* whether or not Apache has access to a file */
    178178 };
    179179 
    180  #define        DONT_CHECK_MODE_BITS    0
     180 #ifdef AFS_LINUX26_ENV
    181181diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
    182 index 2ecd38e..95aafcd 100644
     182index dea580b..6021cc2 100644
    183183--- a/src/afs/afs_analyze.c
    184184+++ b/src/afs/afs_analyze.c
    185 @@ -478,7 +478,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
     185@@ -482,7 +482,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
    186186                         (afid ? afid->Fid.Volume : 0));
    187187        }
     
    193193            areq->volumeError = VOLBUSY;
    194194diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
    195 index efce229..c1c1871 100644
     195index afbb1cf..43ffdfd 100644
    196196--- a/src/afs/afs_osi_pag.c
    197197+++ b/src/afs/afs_osi_pag.c
     
    222222 
    223223diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
    224 index e0a744d..c1c8c8c 100644
     224index e9a84e3..047b3b5 100644
    225225--- a/src/afs/afs_pioctl.c
    226226+++ b/src/afs/afs_pioctl.c
    227 @@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)
     227@@ -1422,6 +1422,10 @@ DECL_PIOCTL(PSetAcl)
    228228     struct rx_connection *rxconn;
    229229     XSTATS_DECLS;
     
    236236     if (!avc)
    237237        return EINVAL;
    238 @@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens)
    239      struct vrequest treq;
     238@@ -1809,6 +1813,10 @@ DECL_PIOCTL(PSetTokens)
    240239     afs_int32 flag, set_parent_pag = 0;
     240     int code;
    241241 
    242242+    if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) {
     
    247247     if (!afs_resourceinit_flag) {
    248248        return EIO;
    249 @@ -2266,6 +2274,11 @@ DECL_PIOCTL(PGetTokens)
     249@@ -2273,6 +2281,11 @@ DECL_PIOCTL(PGetTokens)
    250250     int newStyle;
    251251     int code = E2BIG;
     
    259259     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
    260260        return EIO;             /* Inappropriate ioctl for device */
    261 @@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog)
     261@@ -2383,6 +2396,10 @@ DECL_PIOCTL(PUnlog)
    262262     afs_int32 i;
    263263     struct unixuser *tu;
Note: See TracChangeset for help on using the changeset viewer.