- Timestamp:
- May 26, 2014, 3:16:42 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/fc20-dev/server/common/patches/openafs-scripts.patch
r2066 r2525 46 46 # 47 47 diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c 48 index 7c7705e..0d0e94f10064448 index 03caf1c..699b2ce 100644 49 49 --- a/src/afs/LINUX/osi_vnodeops.c 50 50 +++ 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) 52 52 /* should we always update the attributes at this point? */ 53 53 /* unlikely--the vcache entry hasn't changed */ … … 79 79 #ifdef notyet 80 80 diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c 81 index eabcfeb..639085010064481 index feb0ca7..ba818c7 100644 82 82 --- a/src/afs/VNOPS/afs_vnop_access.c 83 83 +++ b/src/afs/VNOPS/afs_vnop_access.c … … 119 119 } 120 120 diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c 121 index b3931e5..71ef05c 100644121 index d01aff2..0a38c1c 100644 122 122 --- a/src/afs/VNOPS/afs_vnop_attrs.c 123 123 +++ b/src/afs/VNOPS/afs_vnop_attrs.c … … 134 134 #elif defined(AFS_DARWIN80_ENV) 135 135 diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c 136 index 8e7af1c..7e984e9100644136 index 5d96f75..7957eee 100644 137 137 --- a/src/afs/VNOPS/afs_vnop_lookup.c 138 138 +++ b/src/afs/VNOPS/afs_vnop_lookup.c 139 @@ -1 877,6 +1877,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr139 @@ -1915,6 +1915,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr 140 140 } 141 141 … … 151 151 osi_FreeLargeSpace(tname); 152 152 diff --git a/src/afs/afs.h b/src/afs/afs.h 153 index fcc4c70..0d53af6100644153 index 88d5f77..61d3ee9 100644 154 154 --- a/src/afs/afs.h 155 155 +++ b/src/afs/afs.h … … 171 171 afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ 172 172 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 { 175 174 struct afs_q multiPage; /* list of multiPage_range structs */ 176 175 #endif 176 afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */ 177 177 + int apache_access; /* whether or not Apache has access to a file */ 178 178 }; … … 180 180 #define DONT_CHECK_MODE_BITS 0 181 181 diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c 182 index 1834e6d..673a8e6100644182 index 2ecd38e..95aafcd 100644 183 183 --- a/src/afs/afs_analyze.c 184 184 +++ 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, 186 186 (afid ? afid->Fid.Volume : 0)); 187 187 } … … 193 193 areq->volumeError = VOLBUSY; 194 194 diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c 195 index c888605..ff5cf2d100644195 index efce229..c1c1871 100644 196 196 --- a/src/afs/afs_osi_pag.c 197 197 +++ b/src/afs/afs_osi_pag.c … … 206 206 * representation is '41XXXXXX' hex are used to represent the pags. 207 207 @@ -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 */ 209 209 #endif 210 210 } … … 222 222 223 223 diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c 224 index f282510..00f1360100644224 index e0a744d..c1c8c8c 100644 225 225 --- a/src/afs/afs_pioctl.c 226 226 +++ b/src/afs/afs_pioctl.c 227 @@ -14 06,6 +1406,10 @@ DECL_PIOCTL(PSetAcl)227 @@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl) 228 228 struct rx_connection *rxconn; 229 229 XSTATS_DECLS; … … 236 236 if (!avc) 237 237 return EINVAL; 238 @@ -1 790,6 +1794,10 @@ DECL_PIOCTL(PSetTokens)238 @@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens) 239 239 struct vrequest treq; 240 240 afs_int32 flag, set_parent_pag = 0; … … 247 247 if (!afs_resourceinit_flag) { 248 248 return EIO; 249 @@ -22 31,6 +2239,11 @@ DECL_PIOCTL(PGetTokens)249 @@ -2266,6 +2274,11 @@ DECL_PIOCTL(PGetTokens) 250 250 int newStyle; 251 251 int code = E2BIG; … … 259 259 if (!afs_resourceinit_flag) /* afs daemons haven't started yet */ 260 260 return EIO; /* Inappropriate ioctl for device */ 261 @@ -23 41,6 +2354,10 @@ DECL_PIOCTL(PUnlog)261 @@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog) 262 262 afs_int32 i; 263 263 struct unixuser *tu;
Note: See TracChangeset
for help on using the changeset viewer.