Ignore:
Timestamp:
May 26, 2014, 3:16:42 AM (10 years ago)
Author:
achernya
Message:
Modernize spec files for F20
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc20-dev/server/common/patches/openafs-scripts.patch

    r2066 r2525  
    4646#
    4747diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
    48 index 7c7705e..0d0e94f 100644
     48index 03caf1c..699b2ce 100644
    4949--- a/src/afs/LINUX/osi_vnodeops.c
    5050+++ b/src/afs/LINUX/osi_vnodeops.c
    51 @@ -904,6 +904,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
     51@@ -1207,6 +1207,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 eabcfeb..6390850 100644
     81index feb0ca7..ba818c7 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 b3931e5..71ef05c 100644
     121index d01aff2..0a38c1c 100644
    122122--- a/src/afs/VNOPS/afs_vnop_attrs.c
    123123+++ b/src/afs/VNOPS/afs_vnop_attrs.c
     
    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 8e7af1c..7e984e9 100644
     136index 5d96f75..7957eee 100644
    137137--- a/src/afs/VNOPS/afs_vnop_lookup.c
    138138+++ b/src/afs/VNOPS/afs_vnop_lookup.c
    139 @@ -1877,6 +1877,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
     139@@ -1915,6 +1915,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
    140140     }
    141141 
     
    151151        osi_FreeLargeSpace(tname);
    152152diff --git a/src/afs/afs.h b/src/afs/afs.h
    153 index fcc4c70..0d53af6 100644
     153index 88d5f77..61d3ee9 100644
    154154--- a/src/afs/afs.h
    155155+++ b/src/afs/afs.h
     
    171171     afs_int32 flags;           /* things like O_SYNC, O_NONBLOCK go here */
    172172     char initd;                        /* if non-zero, Error fields meaningful */
    173 @@ -887,6 +895,7 @@ struct vcache {
    174  #ifdef AFS_SUN5_ENV
     173@@ -896,6 +904,7 @@ struct vcache {
    175174     struct afs_q multiPage;    /* list of multiPage_range structs */
    176175 #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 };
     
    180180 #define        DONT_CHECK_MODE_BITS    0
    181181diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
    182 index 1834e6d..673a8e6 100644
     182index 2ecd38e..95aafcd 100644
    183183--- a/src/afs/afs_analyze.c
    184184+++ b/src/afs/afs_analyze.c
    185 @@ -368,7 +368,7 @@ afs_Analyze(struct afs_conn *aconn, afs_int32 acode,
     185@@ -478,7 +478,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 c888605..ff5cf2d 100644
     195index efce229..c1c1871 100644
    196196--- a/src/afs/afs_osi_pag.c
    197197+++ b/src/afs/afs_osi_pag.c
     
    206206  * representation is '41XXXXXX' hex are used to represent the pags.
    207207@@ -484,6 +486,15 @@ afs_InitReq(struct vrequest *av, afs_ucred_t *acred)
    208         av->uid = afs_cr_uid(acred);    /* default when no pag is set */
     208        av->uid = afs_cr_ruid(acred);   /* default when no pag is set */
    209209 #endif
    210210     }
     
    222222 
    223223diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
    224 index f282510..00f1360 100644
     224index e0a744d..c1c8c8c 100644
    225225--- a/src/afs/afs_pioctl.c
    226226+++ b/src/afs/afs_pioctl.c
    227 @@ -1406,6 +1406,10 @@ DECL_PIOCTL(PSetAcl)
     227@@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)
    228228     struct rx_connection *rxconn;
    229229     XSTATS_DECLS;
     
    236236     if (!avc)
    237237        return EINVAL;
    238 @@ -1790,6 +1794,10 @@ DECL_PIOCTL(PSetTokens)
     238@@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens)
    239239     struct vrequest treq;
    240240     afs_int32 flag, set_parent_pag = 0;
     
    247247     if (!afs_resourceinit_flag) {
    248248        return EIO;
    249 @@ -2231,6 +2239,11 @@ DECL_PIOCTL(PGetTokens)
     249@@ -2266,6 +2274,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 @@ -2341,6 +2354,10 @@ DECL_PIOCTL(PUnlog)
     261@@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog)
    262262     afs_int32 i;
    263263     struct unixuser *tu;
Note: See TracChangeset for help on using the changeset viewer.