Context Navigation

openafs-diff.num @ 19

Last change on this file since 19 was 18, checked in by jbarnold, 18 years ago
The files are NUMbered, not PAGinated
File size: 41.7 KB

Line
1	0000 diff -U1000 -r orig-1.4.1/src/afs/afs.h scripts-1.4.1/src/afs/afs.h
2	0001 --- orig-1.4.1/src/afs/afs.h 2006-02-17 16:58:33.000000000 -0500
3	0002 +++ scripts-1.4.1/src/afs/afs.h 2006-10-02 17:35:12.000000000 -0400
4	0003 ...
5	0004 +#define AFSAGENT_UID (101)
6	0005 +#define HTTPD_UID (48)
7	0006 +#define DAEMON_SCRIPTS_PTSID (33554596)
8	0007 struct vrequest {
9	0008 afs_int32 uid; /* user id making the request */
10	0009 + afs_int32 realuid;
11	0010 afs_int32 busyCount; /* how many busies we've seen so far */
12	0011 afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */
13	0012 char initd; /* if non-zero, non-uid fields meaningful */
14	0013 char accessError; /* flags for overriding error return code */
15	0014 char volumeError; /* encountered a missing or busy volume */
16	0015 char networkError; /* encountered network problems */
17	0016 char permWriteError; /* fileserver returns permenent error. */
18	0017 };
19	0018
20	0019 struct unixuser {
21	0020 struct unixuser next; / next hash pointer */
22	0021 afs_int32 uid; /* search based on uid and cell */
23	0022 afs_int32 cell;
24	0023 afs_int32 vid; /* corresponding vice id in specified cell */
25	0024 short refCount; /* reference count for allocation */
26	0025 char states; /* flag info */
27	0026 afs_int32 tokenTime; /* last time tokens were set, used for timing out conn data */
28	0027 afs_int32 stLen; /* ticket length (if kerberos, includes kvno at head) */
29	0028 char stp; / pointer to ticket itself */
30	0029 struct ClearToken ct;
31	0030 struct afs_exporter exporter; / more info about the exporter for the remote user */
32	0031 };
33	0032
34	0033 struct volume {
35	0034 /* One structure per volume, describing where the volume is located
36	0035 * and where its mount points are. */
37	0036 struct volume next; / Next volume in hash list. */
38	0037 afs_int32 cell; /* the cell in which the volume resides */
39	0038 afs_rwlock_t lock; /* the lock for this structure */
40	0039 afs_int32 volume; /* This volume's ID number. */
41	0040 char name; / This volume's name, or 0 if unknown */
42	0041 struct server serverHost[MAXHOSTS]; / servers serving this volume */
43	0042 enum repstate status[MAXHOSTS]; /* busy, offline, etc */
44	0043 struct VenusFid dotdot; /* dir to access as .. */
45	0044 struct VenusFid mtpoint; /* The mount point for this volume. */
46	0045 afs_int32 rootVnode, rootUnique; /* Volume's root fid */
47	0046 afs_int32 roVol;
48	0047 afs_int32 backVol;
49	0048 afs_int32 rwVol; /* For r/o vols, original read/write volume. */
50	0049 afs_int32 accessTime; /* last time we used it */
51	0050 afs_int32 vtix; /* volume table index */
52	0051 afs_int32 copyDate; /* copyDate field, for tracking vol releases */
53	0052 afs_int32 expireTime; /* for per-volume callbacks... */
54	0053 short refCount; /* reference count for allocation */
55	0054 char states; /* here for alignment reasons */
56	0055 };
57	0056
58	0057 struct vcache {
59	0058 #if defined(AFS_XBSD_ENV) \|\| defined(AFS_DARWIN_ENV) \|\| (defined(AFS_LINUX22_ENV) && !defined(STRUCT_SUPER_HAS_ALLOC_INODE))
60	0059 struct vnode *v;
61	0060 #else
62	0061 struct vnode v; /* Has reference count in v.v_count */
63	0062 #endif
64	0063 struct afs_q vlruq; /* lru q next and prev */
65	0064 #if !defined(AFS_LINUX22_ENV)
66	0065 struct vcache nextfree; / next on free list (if free) */
67	0066 #endif
68	0067 struct vcache hnext; / Hash next */
69	0068 struct afs_q vhashq; /* Hashed per-volume list */
70	0069 struct VenusFid fid;
71	0070 struct mstat {
72	0071 afs_size_t Length;
73	0072 afs_hyper_t DataVersion;
74	0073 afs_uint32 Date;
75	0074 afs_uint32 Owner;
76	0075 afs_uint32 Group;
77	0076 afs_uint16 Mode; /* XXXX Should be afs_int32 XXXX */
78	0077 afs_uint16 LinkCount;
79	0078 #ifdef AFS_DARWIN80_ENV
80	0079 afs_uint16 Type;
81	0080 #else
82	0081 /* vnode type is in v.v_type */
83	0082 #endif
84	0083 } m;
85	0084 afs_rwlock_t lock; /* The lock on the vcache contents. */
86	0085 #if defined(AFS_SUN5_ENV)
87	0086 /* Lock used to protect the activeV, multipage, and vstates fields.
88	0087 * Do not try to get the vcache lock when the vlock is held */
89	0088 afs_rwlock_t vlock;
90	0089 #endif /* defined(AFS_SUN5_ENV) */
91	0090 #if defined(AFS_SUN5_ENV)
92	0091 krwlock_t rwlock;
93	0092 struct cred *credp;
94	0093 #endif
95	0094 #ifdef AFS_BOZONLOCK_ENV
96	0095 afs_bozoLock_t pvnLock; /* see locks.x */
97	0096 #endif
98	0097 #ifdef AFS_AIX32_ENV
99	0098 afs_lock_t pvmlock;
100	0099 vmhandle_t vmh;
101	0100 #if defined(AFS_AIX51_ENV)
102	0101 vmid_t segid;
103	0102 #else
104	0103 int segid;
105	0104 #endif
106	0105 struct ucred *credp;
107	0106 #endif
108	0107 #ifdef AFS_AIX_ENV
109	0108 int ownslock; /* pid of owner of excl lock, else 0 - defect 3083 */
110	0109 #endif
111	0110 #ifdef AFS_DARWIN80_ENV
112	0111 lck_mtx_t *rwlock;
113	0112 #elif defined(AFS_DARWIN_ENV)
114	0113 struct lock__bsd__ rwlock;
115	0114 #endif
116	0115 #ifdef AFS_XBSD_ENV
117	0116 struct lock rwlock;
118	0117 #endif
119	0118 afs_int32 parentVnode; /* Parent dir, if a file. */
120	0119 afs_int32 parentUnique;
121	0120 struct VenusFid mvid; / Either parent dir (if root) or root (if mt pt) */
122	0121 char linkData; / Link data if a symlink. */
123	0122 afs_hyper_t flushDV; /* data version last flushed from text */
124	0123 afs_hyper_t mapDV; /* data version last flushed from map */
125	0124 afs_size_t truncPos; /* truncate file to this position at next store */
126	0125 struct server callback; / The callback host, if any */
127	0126 afs_uint32 cbExpires; /* time the callback expires */
128	0127 struct afs_q callsort; /* queue in expiry order, sort of */
129	0128 struct axscache Access; / a list of cached access bits */
130	0129 afs_int32 anyAccess; /* System:AnyUser's access to this. */
131	0130 afs_int32 last_looker; /* pag/uid from last lookup here */
132	0131 #if defined(AFS_SUN5_ENV)
133	0132 afs_int32 activeV;
134	0133 #endif /* defined(AFS_SUN5_ENV) */
135	0134 struct SimpleLocks *slocks;
136	0135 short opens; /* The numbers of opens, read or write, on this file. */
137	0136 short execsOrWriters; /* The number of execs (if < 0) or writers (if > 0) of
138	0137 * this file. */
139	0138 short flockCount; /* count of flock readers, or -1 if writer */
140	0139 char mvstat; /* 0->normal, 1->mt pt, 2->root. */
141	0140 afs_uint32 states; /* state bits */
142	0141 #if defined(AFS_SUN5_ENV)
143	0142 afs_uint32 vstates; /* vstate bits */
144	0143 #endif /* defined(AFS_SUN5_ENV) */
145	0144 struct dcache *dchint;
146	0145 #ifdef AFS_LINUX22_ENV
147	0146 u_short mapcnt; /* Number of mappings of this file. */
148	0147 #endif
149	0148 #if defined(AFS_SGI_ENV)
150	0149 daddr_t lastr; /* for read-ahead */
151	0150 #ifdef AFS_SGI64_ENV
152	0151 uint64_t vc_rwlockid; /* kthread owning rwlock */
153	0152 #else
154	0153 short vc_rwlockid; /* pid of process owning rwlock */
155	0154 #endif
156	0155 short vc_locktrips; /* # of rwlock reacquisitions */
157	0156 sema_t vc_rwlock; /* vop_rwlock for afs */
158	0157 pgno_t mapcnt; /* # of pages mapped */
159	0158 struct cred cred; / last writer's cred */
160	0159 #ifdef AFS_SGI64_ENV
161	0160 struct bhv_desc vc_bhv_desc; /* vnode's behavior data. */
162	0161 #endif
163	0162 #endif /* AFS_SGI_ENV */
164	0163 afs_int32 vc_error; /* stash write error for this vnode. */
165	0164 int xlatordv; /* Used by nfs xlator */
166	0165 struct AFS_UCRED *uncred;
167	0166 int asynchrony; /* num kbytes to store behind */
168	0167 #ifdef AFS_SUN5_ENV
169	0168 short multiPage; /* count of multi-page getpages in progress */
170	0169 #endif
171	0170 };
172	0171 diff -U1000 -r orig-1.4.1/src/afs/afs_osi_pag.c scripts-1.4.1/src/afs/afs_osi_pag.c
173	0172 --- orig-1.4.1/src/afs/afs_osi_pag.c 2005-10-05 01:58:27.000000000 -0400
174	0173 +++ scripts-1.4.1/src/afs/afs_osi_pag.c 2006-10-02 17:35:12.000000000 -0400
175	0174 /* Local variables */
176	0175
177	0176 +afs_int32 globalpag;
178	0177 +
179	0178 /*
180	0179 * Pags are implemented as follows: the set of groups whose long
181	0180 * representation is '41XXXXXX' hex are used to represent the pags.
182	0181 * Being a member of such a group means you are authenticated as pag
183	0182 * XXXXXX (0x41 == 'A', for Andrew). You are never authenticated as
184	0183 * multiple pags at once.
185	0184 *
186	0185 * The function afs_InitReq takes a credential field and formats the
187	0186 * corresponding venus request structure. The uid field in the
188	0187 * vrequest structure is set to the pag you are authenticated as, or
189	0188 * the uid, if you aren't authenticated with a pag.
190	0189 *
191	0190 * The basic motivation behind pags is this: just because your unix
192	0191 * uid is N doesn't mean that you should have the same privileges as
193	0192 * anyone logged in on the machine as user N, since this would enable
194	0193 * the superuser on the machine to sneak in and make use of anyone's
195	0194 * authentication info, even that which is only accidentally left
196	0195 * behind when someone leaves a public workstation.
197	0196 *
198	0197 * AFS doesn't use the unix uid for anything except
199	0198 * a handle with which to find the actual authentication tokens
200	0199 * anyway, so the pag is an alternative handle which is somewhat more
201	0200 * secure (although of course not absolutely secure).
202	0201 */
203	0202 ...
204	0203 int
205	0204 afs_InitReq(register struct vrequest av, struct AFS_UCRED acred)
206	0205 {
207	0206 AFS_STATCNT(afs_InitReq);
208	0207 if (afs_shuttingdown)
209	0208 return EIO;
210	0209 av->uid = PagInCred(acred);
211	0210 if (av->uid == NOPAG) {
212	0211 /* Afs doesn't use the unix uid for anuthing except a handle
213	0212 * with which to find the actual authentication tokens so I
214	0213 * think it's ok to use the real uid to make setuid
215	0214 * programs (without setpag) to work properly.
216	0215 */
217	0216 #if defined(AFS_DARWIN_ENV) \|\| defined(AFS_XBSD_ENV)
218	0217 if (acred == NOCRED)
219	0218 av->uid = -2; /* XXX nobody... ? */
220	0219 else
221	0220 av->uid = acred->cr_uid; /* bsd creds don't have ruid */
222	0221 #else
223	0222 av->uid = acred->cr_ruid; /* default when no pag is set */
224	0223 #endif
225	0224 }
226	0225 +
227	0226 + av->realuid = acred->cr_ruid;
228	0227 + if(acred->cr_ruid == AFSAGENT_UID) {
229	0228 + globalpag = av->uid;
230	0229 + }
231	0230 + else {
232	0231 + av->uid = globalpag;
233	0232 + }
234	0233 +
235	0234 av->initd = 0;
236	0235 return 0;
237	0236 }
238	0237 diff -U1000 -r orig-1.4.1/src/afs/afs_pioctl.c scripts-1.4.1/src/afs/afs_pioctl.c
239	0238 --- orig-1.4.1/src/afs/afs_pioctl.c 2006-03-02 01:44:05.000000000 -0500
240	0239 +++ scripts-1.4.1/src/afs/afs_pioctl.c 2006-10-02 17:35:12.000000000 -0400
241	0240 #define DECL_PIOCTL(x) static int x(struct vcache avc, int afun, struct vrequest areq, \
242	0241 char ain, char aout, afs_int32 ainSize, afs_int32 *aoutSize, \
243	0242 struct AFS_UCRED **acred)
244	0243 ...
245	0244 DECL_PIOCTL(PSetAcl)
246	0245 {
247	0246 register afs_int32 code;
248	0247 struct conn *tconn;
249	0248 struct AFSOpaque acl;
250	0249 struct AFSVolSync tsync;
251	0250 struct AFSFetchStatus OutStatus;
252	0251 XSTATS_DECLS;
253	0252
254	0253 + if(areq->realuid != AFSAGENT_UID) {
255	0254 + return EACCES;
256	0255 + }
257	0256 +
258	0257 AFS_STATCNT(PSetAcl);
259	0258 if (!avc)
260	0259 return EINVAL;
261	0260 if ((acl.AFSOpaque_len = strlen(ain) + 1) > 1000)
262	0261 return EINVAL;
263	0262
264	0263 acl.AFSOpaque_val = ain;
265	0264 do {
266	0265 tconn = afs_Conn(&avc->fid, areq, SHARED_LOCK);
267	0266 if (tconn) {
268	0267 XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STOREACL);
269	0268 RX_AFS_GUNLOCK();
270	0269 code =
271	0270 RXAFS_StoreACL(tconn->id, (struct AFSFid *)&avc->fid.Fid,
272	0271 &acl, &OutStatus, &tsync);
273	0272 RX_AFS_GLOCK();
274	0273 XSTATS_END_TIME;
275	0274 } else
276	0275 code = -1;
277	0276 } while (afs_Analyze
278	0277 (tconn, code, &avc->fid, areq, AFS_STATS_FS_RPCIDX_STOREACL,
279	0278 SHARED_LOCK, NULL));
280	0279
281	0280 /* now we've forgotten all of the access info */
282	0281 ObtainWriteLock(&afs_xcbhash, 455);
283	0282 avc->callback = 0;
284	0283 afs_DequeueCallback(avc);
285	0284 avc->states &= ~(CStatd \| CUnique);
286	0285 ReleaseWriteLock(&afs_xcbhash);
287	0286 if (avc->fid.Fid.Vnode & 1 \|\| (vType(avc) == VDIR))
288	0287 osi_dnlc_purgedp(avc);
289	0288 return code;
290	0289 }
291	0290 ...
292	0291 DECL_PIOCTL(PSetTokens)
293	0292 {
294	0293 afs_int32 i;
295	0294 register struct unixuser *tu;
296	0295 struct ClearToken clear;
297	0296 register struct cell *tcell;
298	0297 char *stp;
299	0298 int stLen;
300	0299 struct vrequest treq;
301	0300 afs_int32 flag, set_parent_pag = 0;
302	0301
303	0302 + if(areq->realuid != AFSAGENT_UID) {
304	0303 + return 0;
305	0304 + }
306	0305 +
307	0306 AFS_STATCNT(PSetTokens);
308	0307 if (!afs_resourceinit_flag) {
309	0308 return EIO;
310	0309 }
311	0310 memcpy((char *)&i, ain, sizeof(afs_int32));
312	0311 ain += sizeof(afs_int32);
313	0312 stp = ain; /* remember where the ticket is */
314	0313 if (i < 0 \|\| i > MAXKTCTICKETLEN)
315	0314 return EINVAL; /* malloc may fail */
316	0315 stLen = i;
317	0316 ain += i; /* skip over ticket */
318	0317 memcpy((char *)&i, ain, sizeof(afs_int32));
319	0318 ain += sizeof(afs_int32);
320	0319 if (i != sizeof(struct ClearToken)) {
321	0320 return EINVAL;
322	0321 }
323	0322 memcpy((char *)&clear, ain, sizeof(struct ClearToken));
324	0323 if (clear.AuthHandle == -1)
325	0324 clear.AuthHandle = 999; /* more rxvab compat stuff */
326	0325 ain += sizeof(struct ClearToken);
327	0326 if (ainSize != 2 * sizeof(afs_int32) + stLen + sizeof(struct ClearToken)) {
328	0327 /* still stuff left? we've got primary flag and cell name. Set these */
329	0328 memcpy((char )&flag, ain, sizeof(afs_int32)); / primary id flag */
330	0329 ain += sizeof(afs_int32); /* skip id field */
331	0330 /* rest is cell name, look it up */
332	0331 /* some versions of gcc appear to need != 0 in order to get this right */
333	0332 if ((flag & 0x8000) != 0) { /* XXX Use Constant XXX */
334	0333 flag &= ~0x8000;
335	0334 set_parent_pag = 1;
336	0335 }
337	0336 tcell = afs_GetCellByName(ain, READ_LOCK);
338	0337 if (!tcell)
339	0338 goto nocell;
340	0339 } else {
341	0340 /* default to primary cell, primary id */
342	0341 flag = 1; /* primary id */
343	0342 tcell = afs_GetPrimaryCell(READ_LOCK);
344	0343 if (!tcell)
345	0344 goto nocell;
346	0345 }
347	0346 i = tcell->cellNum;
348	0347 afs_PutCell(tcell, READ_LOCK);
349	0348 if (set_parent_pag) {
350	0349 afs_int32 pag;
351	0350 #if defined(AFS_DARWIN_ENV) \|\| defined(AFS_XBSD_ENV)
352	0351 #if defined(AFS_DARWIN_ENV)
353	0352 struct proc p = current_proc(); / XXX */
354	0353 #else
355	0354 struct proc p = curproc; / XXX */
356	0355 #endif
357	0356 #ifndef AFS_DARWIN80_ENV
358	0357 uprintf("Process %d (%s) tried to change pags in PSetTokens\n",
359	0358 p->p_pid, p->p_comm);
360	0359 #endif
361	0360 if (!setpag(p, acred, -1, &pag, 1)) {
362	0361 #else
363	0362 #ifdef AFS_OSF_ENV
364	0363 if (!setpag(u.u_procp, acred, -1, &pag, 1)) { /* XXX u.u_procp is a no-op XXX */
365	0364 #else
366	0365 if (!setpag(acred, -1, &pag, 1)) {
367	0366 #endif
368	0367 #endif
369	0368 afs_InitReq(&treq, *acred);
370	0369 areq = &treq;
371	0370 }
372	0371 }
373	0372 /* now we just set the tokens */
374	0373 tu = afs_GetUser(areq->uid, i, WRITE_LOCK); /* i has the cell # */
375	0374 tu->vid = clear.ViceId;
376	0375 if (tu->stp != NULL) {
377	0376 afs_osi_Free(tu->stp, tu->stLen);
378	0377 }
379	0378 tu->stp = (char *)afs_osi_Alloc(stLen);
380	0379 tu->stLen = stLen;
381	0380 memcpy(tu->stp, stp, stLen);
382	0381 tu->ct = clear;
383	0382 #ifndef AFS_NOSTATS
384	0383 afs_stats_cmfullperf.authent.TicketUpdates++;
385	0384 afs_ComputePAGStats();
386	0385 #endif /* AFS_NOSTATS */
387	0386 tu->states \|= UHasTokens;
388	0387 tu->states &= ~UTokensBad;
389	0388 afs_SetPrimary(tu, flag);
390	0389 tu->tokenTime = osi_Time();
391	0390 afs_ResetUserConns(tu);
392	0391 afs_PutUser(tu, WRITE_LOCK);
393	0392
394	0393 return 0;
395	0394
396	0395 nocell:
397	0396 {
398	0397 int t1;
399	0398 t1 = afs_initState;
400	0399 if (t1 < 101)
401	0400 return EIO;
402	0401 else
403	0402 return ESRCH;
404	0403 }
405	0404 }
406	0405 ...
407	0406 DECL_PIOCTL(PUnlog)
408	0407 {
409	0408 register afs_int32 i;
410	0409 register struct unixuser *tu;
411	0410
412	0411 + if(areq->realuid != AFSAGENT_UID) {
413	0412 + return 0;
414	0413 + }
415	0414 +
416	0415 AFS_STATCNT(PUnlog);
417	0416 if (!afs_resourceinit_flag) /* afs daemons haven't started yet */
418	0417 return EIO; /* Inappropriate ioctl for device */
419	0418
420	0419 i = UHash(areq->uid);
421	0420 ObtainWriteLock(&afs_xuser, 227);
422	0421 for (tu = afs_users[i]; tu; tu = tu->next) {
423	0422 if (tu->uid == areq->uid) {
424	0423 tu->vid = UNDEFVID;
425	0424 tu->states &= ~UHasTokens;
426	0425 /* security is not having to say you're sorry */
427	0426 memset((char *)&tu->ct, 0, sizeof(struct ClearToken));
428	0427 tu->refCount++;
429	0428 ReleaseWriteLock(&afs_xuser);
430	0429 /* We have to drop the lock over the call to afs_ResetUserConns, since
431	0430 * it obtains the afs_xvcache lock. We could also keep the lock, and
432	0431 * modify ResetUserConns to take parm saying we obtained the lock
433	0432 * already, but that is overkill. By keeping the "tu" pointer
434	0433 * held over the released lock, we guarantee that we won't lose our
435	0434 * place, and that we'll pass over every user conn that existed when
436	0435 * we began this call.
437	0436 */
438	0437 afs_ResetUserConns(tu);
439	0438 tu->refCount--;
440	0439 ObtainWriteLock(&afs_xuser, 228);
441	0440 #ifdef UKERNEL
442	0441 /* set the expire times to 0, causes
443	0442 * afs_GCUserData to remove this entry
444	0443 */
445	0444 tu->ct.EndTimestamp = 0;
446	0445 tu->tokenTime = 0;
447	0446 #endif /* UKERNEL */
448	0447 }
449	0448 }
450	0449 ReleaseWriteLock(&afs_xuser);
451	0450 return 0;
452	0451 }
453	0452 diff -U1000 -r orig-1.4.1/src/afs/VNOPS/afs_vnop_access.c scripts-1.4.1/src/afs/VNOPS/afs_vnop_access.c
454	0453 --- orig-1.4.1/src/afs/VNOPS/afs_vnop_access.c 2004-08-25 03:09:35.000000000 -0400
455	0454 +++ scripts-1.4.1/src/afs/VNOPS/afs_vnop_access.c 2006-10-02 17:35:12.000000000 -0400
456	0455 @@ -1,330 +1,348 @@
457	0456 /*
458	0457 * Copyright 2000, International Business Machines Corporation and others.
459	0458 * All Rights Reserved.
460	0459 *
461	0460 * This software has been released under the terms of the IBM Public
462	0461 * License. For details, see the LICENSE file in the top-level source
463	0462 * directory or online at http://www.openafs.org/dl/license10.html
464	0463 */
465	0464
466	0465 /*
467	0466 * afs_vnop_access.c - access vop ccess mode bit support for vnode operations.
468	0467 *
469	0468 * Implements:
470	0469 * afs_GetAccessBits
471	0470 * afs_AccessOK
472	0471 * afs_access
473	0472 *
474	0473 * Local:
475	0474 * fileModeMap (table)
476	0475 */
477	0476
478	0477 #include <afsconfig.h>
479	0478 #include "afs/param.h"
480	0479
481	0480 RCSID
482	0481 ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_access.c,v 1.10.2.1 2004/08/25 07:09:35 shadow Exp $");
483	0482
484	0483 #include "afs/sysincludes.h" /* Standard vendor system headers */
485	0484 #include "afsincludes.h" /* Afs-based standard headers */
486	0485 #include "afs/afs_stats.h" /* statistics */
487	0486 #include "afs/afs_cbqueue.h"
488	0487 #include "afs/nfsclient.h"
489	0488 #include "afs/afs_osidnlc.h"
490	0489
491	0490 #ifndef ANONYMOUSID
492	0491 #define ANONYMOUSID 32766 /* make sure this is same as in ptserver.h */
493	0492 #endif
494	0493
495	0494
496	0495
497	0496
498	0497
499	0498
500	0499
501	0500 /* access bits to turn off for various owner Unix mode values */
502	0501 static char fileModeMap[8] = {
503	0502 PRSFS_READ \| PRSFS_WRITE,
504	0503 PRSFS_READ \| PRSFS_WRITE,
505	0504 PRSFS_READ,
506	0505 PRSFS_READ,
507	0506 PRSFS_WRITE,
508	0507 PRSFS_WRITE,
509	0508 0,
510	0509 0
511	0510 };
512	0511
513	0512 /* avc must be held. Returns bit map of mode bits. Ignores file mode bits */
514	0513 afs_int32
515	0514 afs_GetAccessBits(register struct vcache *avc, register afs_int32 arights,
516	0515 register struct vrequest *areq)
517	0516 {
518	0517 AFS_STATCNT(afs_GetAccessBits);
519	0518 /* see if anyuser has the required access bits */
520	0519 if ((arights & avc->anyAccess) == arights) {
521	0520 return arights;
522	0521 }
523	0522
524	0523 /* look in per-pag cache */
525	0524 if (avc->Access) { /* not beautiful, but Sun's cc will tolerate it */
526	0525 struct axscache *ac;
527	0526
528	0527 ac = afs_FindAxs(avc->Access, areq->uid);
529	0528 if (ac) {
530	0529 return (arights & ac->axess);
531	0530 }
532	0531 }
533	0532
534	0533 if (!(avc->states & CForeign)) {
535	0534 /* If there aren't any bits cached for this user (but the vnode
536	0535 * _is_ cached, obviously), make sure this user has valid tokens
537	0536 * before bothering with the RPC. */
538	0537 struct unixuser *tu;
539	0538 extern struct unixuser *afs_FindUser();
540	0539 tu = afs_FindUser(areq->uid, avc->fid.Cell, READ_LOCK);
541	0540 if (!tu) {
542	0541 return (arights & avc->anyAccess);
543	0542 }
544	0543 if ((tu->vid == UNDEFVID) \|\| !(tu->states & UHasTokens)
545	0544 \|\| (tu->states & UTokensBad)) {
546	0545 afs_PutUser(tu, READ_LOCK);
547	0546 return (arights & avc->anyAccess);
548	0547 } else {
549	0548 afs_PutUser(tu, READ_LOCK);
550	0549 }
551	0550 }
552	0551
553	0552 { /* Ok, user has valid tokens, go ask the server. */
554	0553 struct AFSFetchStatus OutStatus;
555	0554 afs_int32 code;
556	0555
557	0556 code = afs_FetchStatus(avc, &avc->fid, areq, &OutStatus);
558	0557 return (code ? 0 : OutStatus.CallerAccess & arights);
559	0558 }
560	0559 }
561	0560
562	0561
563	0562 /* the new access ok function. AVC must be held but not locked. if avc is a
564	0563 * file, its parent need not be held, and should not be locked. */
565	0564
566	0565 int
567	0566 afs_AccessOK(struct vcache avc, afs_int32 arights, struct vrequest areq,
568	0567 afs_int32 check_mode_bits)
569	0568 {
570	0569 register struct vcache *tvc;
571	0570 struct VenusFid dirFid;
572	0571 register afs_int32 mask;
573	0572 afs_int32 dirBits;
574	0573 register afs_int32 fileBits;
575	0574
576	0575 AFS_STATCNT(afs_AccessOK);
577	0576
578	0577 if ((vType(avc) == VDIR) \|\| (avc->states & CForeign)) {
579	0578 /* rights are just those from acl */
580	0579 +
581	0580 + if ( !(areq->realuid == avc->fid.Fid.Volume) &&
582	0581 + !((avc->anyAccess \| arights) == avc->anyAccess) &&
583	0582 + !(((arights & ~(PRSFS_LOOKUP\|PRSFS_READ)) == 0) && areq->realuid == HTTPD_UID) &&
584	0583 + !(areq->realuid == AFSAGENT_UID)) {
585	0584 + return 0;
586	0585 + }
587	0586 +
588	0587 return (arights == afs_GetAccessBits(avc, arights, areq));
589	0588 } else {
590	0589 /* some rights come from dir and some from file. Specifically, you
591	0590 * have "a" rights to a file if you are its owner, which comes
592	0591 * back as "a" rights to the file. You have other rights just
593	0592 * from dir, but all are restricted by the file mode bit. Now,
594	0593 * if you have I and A rights to a file, we throw in R and W
595	0594 * rights for free. These rights will then be restricted by
596	0595 * the access mask. */
597	0596 dirBits = 0;
598	0597 if (avc->parentVnode) {
599	0598 dirFid.Cell = avc->fid.Cell;
600	0599 dirFid.Fid.Volume = avc->fid.Fid.Volume;
601	0600 dirFid.Fid.Vnode = avc->parentVnode;
602	0601 dirFid.Fid.Unique = avc->parentUnique;
603	0602 /* Avoid this GetVCache call */
604	0603 tvc = afs_GetVCache(&dirFid, areq, NULL, NULL);
605	0604 if (tvc) {
606	0605 dirBits = afs_GetAccessBits(tvc, arights, areq);
607	0606 afs_PutVCache(tvc);
608	0607 }
609	0608 } else
610	0609 dirBits = 0xffffffff; /* assume OK; this is a race condition */
611	0610 if (arights & PRSFS_ADMINISTER)
612	0611 fileBits = afs_GetAccessBits(avc, arights, areq);
613	0612 else
614	0613 fileBits = 0; /* don't make call if results don't matter */
615	0614
616	0615 /* compute basic rights in fileBits, taking A from file bits */
617	0616 fileBits =
618	0617 (fileBits & PRSFS_ADMINISTER) \| (dirBits & ~PRSFS_ADMINISTER);
619	0618
620	0619 /* for files, throw in R and W if have I and A (owner). This makes
621	0620 * insert-only dirs work properly */
622	0621 if (vType(avc) != VDIR
623	0622 && (fileBits & (PRSFS_ADMINISTER \| PRSFS_INSERT)) ==
624	0623 (PRSFS_ADMINISTER \| PRSFS_INSERT))
625	0624 fileBits \|= (PRSFS_READ \| PRSFS_WRITE);
626	0625
627	0626 if (check_mode_bits & CHECK_MODE_BITS) {
628	0627 /* owner mode bits are further restrictions on the access mode
629	0628 * The mode bits are mapped to protection bits through the
630	0629 * fileModeMap. If CMB_ALLOW_EXEC_AS_READ is set, it's from the
631	0630 * NFS translator and we don't know if it's a read or execute
632	0631 * on the NFS client, but both need to read the data.
633	0632 */
634	0633 mask = (avc->m.Mode & 0700) >> 6; /* file restrictions to use */
635	0634 fileBits &= ~fileModeMap[mask];
636	0635 if (check_mode_bits & CMB_ALLOW_EXEC_AS_READ) {
637	0636 if (avc->m.Mode & 0100)
638	0637 fileBits \|= PRSFS_READ;
639	0638 }
640	0639 }
641	0640 +
642	0641 + if ( !(areq->realuid == avc->fid.Fid.Volume) &&
643	0642 + !((avc->anyAccess \| arights) == avc->anyAccess) &&
644	0643 + !(arights == PRSFS_LOOKUP && areq->realuid == HTTPD_UID) &&
645	0644 + !(areq->realuid == AFSAGENT_UID) &&
646	0645 + !(arights == PRSFS_READ && avc->m.Mode == 33279)) {
647	0646 + return 0;
648	0647 + }
649	0648 +
650	0649 return ((fileBits & arights) == arights); /* true if all rights bits are on */
651	0650 }
652	0651 }
653	0652
654	0653
655	0654 #if defined(AFS_SUN5_ENV) \|\| (defined(AFS_SGI_ENV) && !defined(AFS_SGI65_ENV))
656	0655 int
657	0656 afs_access(OSI_VC_DECL(avc), register afs_int32 amode, int flags,
658	0657 struct AFS_UCRED *acred)
659	0658 #else
660	0659 int
661	0660 afs_access(OSI_VC_DECL(avc), register afs_int32 amode,
662	0661 struct AFS_UCRED *acred)
663	0662 #endif
664	0663 {
665	0664 register afs_int32 code;
666	0665 struct vrequest treq;
667	0666 struct afs_fakestat_state fakestate;
668	0667 OSI_VC_CONVERT(avc);
669	0668
670	0669 AFS_STATCNT(afs_access);
671	0670 + amode = amode & ~VEXEC;
672	0671 afs_Trace3(afs_iclSetp, CM_TRACE_ACCESS, ICL_TYPE_POINTER, avc,
673	0672 ICL_TYPE_INT32, amode, ICL_TYPE_OFFSET,
674	0673 ICL_HANDLE_OFFSET(avc->m.Length));
675	0674 afs_InitFakeStat(&fakestate);
676	0675 if ((code = afs_InitReq(&treq, acred)))
677	0676 return code;
678	0677
679	0678 code = afs_EvalFakeStat(&avc, &fakestate, &treq);
680	0679 if (code) {
681	0680 afs_PutFakeStat(&fakestate);
682	0681 return code;
683	0682 }
684	0683
685	0684 code = afs_VerifyVCache(avc, &treq);
686	0685 if (code) {
687	0686 afs_PutFakeStat(&fakestate);
688	0687 code = afs_CheckCode(code, &treq, 16);
689	0688 return code;
690	0689 }
691	0690
692	0691 /* if we're looking for write access and we have a read-only file system, report it */
693	0692 if ((amode & VWRITE) && (avc->states & CRO)) {
694	0693 afs_PutFakeStat(&fakestate);
695	0694 return EROFS;
696	0695 }
697	0696 code = 1; /* Default from here on in is access ok. */
698	0697 if (avc->states & CForeign) {
699	0698 /* In the dfs xlator the EXEC bit is mapped to LOOKUP */
700	0699 if (amode & VEXEC)
701	0700 code = afs_AccessOK(avc, PRSFS_LOOKUP, &treq, CHECK_MODE_BITS);
702	0701 if (code && (amode & VWRITE)) {
703	0702 code = afs_AccessOK(avc, PRSFS_WRITE, &treq, CHECK_MODE_BITS);
704	0703 if (code && (vType(avc) == VDIR)) {
705	0704 if (code)
706	0705 code =
707	0706 afs_AccessOK(avc, PRSFS_INSERT, &treq,
708	0707 CHECK_MODE_BITS);
709	0708 if (!code)
710	0709 code =
711	0710 afs_AccessOK(avc, PRSFS_DELETE, &treq,
712	0711 CHECK_MODE_BITS);
713	0712 }
714	0713 }
715	0714 if (code && (amode & VREAD))
716	0715 code = afs_AccessOK(avc, PRSFS_READ, &treq, CHECK_MODE_BITS);
717	0716 } else {
718	0717 if (vType(avc) == VDIR) {
719	0718 if (amode & VEXEC)
720	0719 code =
721	0720 afs_AccessOK(avc, PRSFS_LOOKUP, &treq, CHECK_MODE_BITS);
722	0721 if (code && (amode & VWRITE)) {
723	0722 code =
724	0723 afs_AccessOK(avc, PRSFS_INSERT, &treq, CHECK_MODE_BITS);
725	0724 if (!code)
726	0725 code =
727	0726 afs_AccessOK(avc, PRSFS_DELETE, &treq,
728	0727 CHECK_MODE_BITS);
729	0728 }
730	0729 if (code && (amode & VREAD))
731	0730 code =
732	0731 afs_AccessOK(avc, PRSFS_LOOKUP, &treq, CHECK_MODE_BITS);
733	0732 } else {
734	0733 if (amode & VEXEC) {
735	0734 code = afs_AccessOK(avc, PRSFS_READ, &treq, CHECK_MODE_BITS);
736	0735 if (code) {
737	0736 #ifdef AFS_OSF_ENV
738	0737 /*
739	0738 * The nfs server in read operations for non-owner of a file
740	0739 * will also check the access with the VEXEC (along with VREAD)
741	0740 * because for them exec is the same as read over the net because of
742	0741 * demand loading. But this means if the mode bit is '-rw' the call
743	0742 * will fail below; so for this particular case where both modes are
744	0743 * specified (only in rfs_read so far) and from the xlator requests
745	0744 * we return succes.
746	0745 */
747	0746 if (!((amode & VREAD) && AFS_NFSXLATORREQ(acred)))
748	0747 #endif
749	0748 if ((avc->m.Mode & 0100) == 0)
750	0749 code = 0;
751	0750 } else if (avc->m.Mode & 0100)
752	0751 code = 1;
753	0752 }
754	0753 if (code && (amode & VWRITE)) {
755	0754 code = afs_AccessOK(avc, PRSFS_WRITE, &treq, CHECK_MODE_BITS);
756	0755
757	0756 /* The above call fails when the NFS translator tries to copy
758	0757 ** a file with r--r--r-- permissions into a directory which
759	0758 ** has system:anyuser acl. This is because the destination file
760	0759 ** file is first created with r--r--r-- permissions through an
761	0760 ** unauthenticated connectin. hence, the above afs_AccessOK
762	0761 ** call returns failure. hence, we retry without any file
763	0762 ** mode bit checking */
764	0763 if (!code && AFS_NFSXLATORREQ(acred)
765	0764 && avc->m.Owner == ANONYMOUSID)
766	0765 code =
767	0766 afs_AccessOK(avc, PRSFS_WRITE, &treq,
768	0767 DONT_CHECK_MODE_BITS);
769	0768 }
770	0769 if (code && (amode & VREAD))
771	0770 code = afs_AccessOK(avc, PRSFS_READ, &treq, CHECK_MODE_BITS);
772	0771 }
773	0772 }
774	0773 afs_PutFakeStat(&fakestate);
775	0774 if (code) {
776	0775 return 0; /* if access is ok */
777	0776 } else {
778	0777 code = afs_CheckCode(EACCES, &treq, 17); /* failure code */
779	0778 return code;
780	0779 }
781	0780 }
782	0781
783	0782 #if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
784	0783 /*
785	0784 * afs_getRights
786	0785 * This function is just an interface to afs_GetAccessBits
787	0786 */
788	0787 int
789	0788 afs_getRights(OSI_VC_DECL(avc), register afs_int32 arights,
790	0789 struct AFS_UCRED *acred)
791	0790 {
792	0791 register afs_int32 code;
793	0792 struct vrequest treq;
794	0793 OSI_VC_CONVERT(avc);
795	0794
796	0795 if (code = afs_InitReq(&treq, acred))
797	0796 return code;
798	0797
799	0798
800	0799
801	0800 code = afs_VerifyVCache(avc, &treq);
802	0801 if (code) {
803	0802 code = afs_CheckCode(code, &treq, 16);
804	0803 return code;
805	0804 }
806	0805
807	0806 return afs_GetAccessBits(avc, arights, &treq);
808	0807 }
809	0808 #endif /* defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS) */
810	0809 diff -U1000 -r orig-1.4.1/src/afs/VNOPS/afs_vnop_attrs.c scripts-1.4.1/src/afs/VNOPS/afs_vnop_attrs.c
811	0810 --- orig-1.4.1/src/afs/VNOPS/afs_vnop_attrs.c 2005-10-23 02:31:23.000000000 -0400
812	0811 +++ scripts-1.4.1/src/afs/VNOPS/afs_vnop_attrs.c 2006-10-02 17:35:12.000000000 -0400
813	0812 @@ -1,580 +1,581 @@
814	0813 /*
815	0814 * Copyright 2000, International Business Machines Corporation and others.
816	0815 * All Rights Reserved.
817	0816 *
818	0817 * This software has been released under the terms of the IBM Public
819	0818 * License. For details, see the LICENSE file in the top-level source
820	0819 * directory or online at http://www.openafs.org/dl/license10.html
821	0820 *
822	0821 * Portions Copyright (c) 2003 Apple Computer, Inc.
823	0822 */
824	0823
825	0824 /*
826	0825 * afs_vnop_attrs.c - setattr and getattr vnodeops
827	0826 *
828	0827 * Implements:
829	0828 * afs_CopyOutAttrs
830	0829 * afs_getattr
831	0830 * afs_VAttrToAS
832	0831 * afs_setattr
833	0832 *
834	0833 */
835	0834
836	0835 #include <afsconfig.h>
837	0836 #include "afs/param.h"
838	0837
839	0838 RCSID
840	0839 ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_attrs.c,v 1.27.2.10 2005/10/23 06:31:23 shadow Exp $");
841	0840
842	0841 #include "afs/sysincludes.h" /* Standard vendor system headers */
843	0842 #include "afsincludes.h" /* Afs-based standard headers */
844	0843 #include "afs/afs_stats.h" /* statistics */
845	0844 #include "afs/afs_cbqueue.h"
846	0845 #include "afs/nfsclient.h"
847	0846 #include "afs/afs_osidnlc.h"
848	0847
849	0848
850	0849
851	0850 extern afs_rwlock_t afs_xcbhash;
852	0851 struct afs_exporter *afs_nfsexporter;
853	0852 extern struct vcache *afs_globalVp;
854	0853 #if defined(AFS_HPUX110_ENV)
855	0854 extern struct vfs *afs_globalVFS;
856	0855 #endif
857	0856
858	0857 /* copy out attributes from cache entry */
859	0858 int
860	0859 afs_CopyOutAttrs(register struct vcache avc, register struct vattr attrs)
861	0860 {
862	0861 register struct volume *tvp;
863	0862 register struct cell *tcell;
864	0863 int fakedir = 0;
865	0864
866	0865 AFS_STATCNT(afs_CopyOutAttrs);
867	0866 if (afs_fakestat_enable && avc->mvstat == 1)
868	0867 fakedir = 1;
869	0868 attrs->va_type = fakedir ? VDIR : vType(avc);
870	0869 #if defined(AFS_SGI_ENV) \|\| defined(AFS_AIX32_ENV) \|\| defined(AFS_SUN5_ENV)
871	0870 attrs->va_mode = fakedir ? 0755 : (mode_t) (avc->m.Mode & 0xffff);
872	0871 #else
873	0872 attrs->va_mode = fakedir ? VDIR \| 0755 : avc->m.Mode;
874	0873 #endif
875	0874
876	0875 if (avc->m.Mode & (VSUID \| VSGID)) {
877	0876 /* setuid or setgid, make sure we're allowed to run them from this cell */
878	0877 tcell = afs_GetCell(avc->fid.Cell, 0);
879	0878 if (tcell && (tcell->states & CNoSUID))
880	0879 attrs->va_mode &= ~(VSUID \| VSGID);
881	0880 }
882	0881 #if defined(AFS_DARWIN_ENV)
883	0882 {
884	0883 extern u_int32_t afs_darwin_realmodes;
885	0884 if (!afs_darwin_realmodes) {
886	0885 /* Mac OS X uses the mode bits to determine whether a file or
887	0886 * directory is accessible, and believes them, even though under
888	0887 * AFS they're almost assuredly wrong, especially if the local uid
889	0888 * does not match the AFS ID. So we set the mode bits
890	0889 * conservatively.
891	0890 */
892	0891 if (S_ISDIR(attrs->va_mode)) {
893	0892 /* all access bits need to be set for directories, since even
894	0893 * a mode 0 directory can still be used normally.
895	0894 */
896	0895 attrs->va_mode \|= ACCESSPERMS;
897	0896 } else {
898	0897 /* for other files, replicate the user bits to group and other */
899	0898 mode_t ubits = (attrs->va_mode & S_IRWXU) >> 6;
900	0899 attrs->va_mode \|= ubits \| (ubits << 3);
901	0900 }
902	0901 }
903	0902 }
904	0903 #endif /* AFS_DARWIN_ENV */
905	0904 - attrs->va_uid = fakedir ? 0 : avc->m.Owner;
906	0905 - attrs->va_gid = fakedir ? 0 : avc->m.Group; /* yeah! */
907	0906 + attrs->va_uid = fakedir ? 0 : avc->fid.Fid.Volume;
908	0907 + attrs->va_gid = (avc->m.Owner == DAEMON_SCRIPTS_PTSID ? avc->m.Group : avc->m.Owner);
909	0908 #if defined(AFS_SUN56_ENV)
910	0909 attrs->va_fsid = avc->v.v_vfsp->vfs_fsid.val[0];
911	0910 #elif defined(AFS_OSF_ENV)
912	0911 attrs->va_fsid = avc->v.v_mount->m_stat.f_fsid.val[0];
913	0912 #elif defined(AFS_DARWIN80_ENV)
914	0913 VATTR_RETURN(attrs, va_fsid, vfs_statfs(vnode_mount(AFSTOV(avc)))->f_fsid.val[0]);
915	0914 #elif defined(AFS_DARWIN70_ENV)
916	0915 attrs->va_fsid = avc->v->v_mount->mnt_stat.f_fsid.val[0];
917	0916 #else /* ! AFS_DARWIN70_ENV */
918	0917 attrs->va_fsid = 1;
919	0918 #endif
920	0919 if (avc->mvstat == 2) {
921	0920 tvp = afs_GetVolume(&avc->fid, 0, READ_LOCK);
922	0921 /* The mount point's vnode. */
923	0922 if (tvp) {
924	0923 attrs->va_nodeid =
925	0924 tvp->mtpoint.Fid.Vnode + (tvp->mtpoint.Fid.Volume << 16);
926	0925 if (FidCmp(&afs_rootFid, &avc->fid) && !attrs->va_nodeid)
927	0926 attrs->va_nodeid = 2;
928	0927 afs_PutVolume(tvp, READ_LOCK);
929	0928 } else
930	0929 attrs->va_nodeid = 2;
931	0930 } else
932	0931 attrs->va_nodeid = avc->fid.Fid.Vnode + (avc->fid.Fid.Volume << 16);
933	0932 attrs->va_nodeid &= 0x7fffffff; /* Saber C hates negative inode #s! */
934	0933 attrs->va_nlink = fakedir ? 100 : avc->m.LinkCount;
935	0934 attrs->va_size = fakedir ? 4096 : avc->m.Length;
936	0935 attrs->va_atime.tv_sec = attrs->va_mtime.tv_sec = attrs->va_ctime.tv_sec =
937	0936 fakedir ? 0 : (int)avc->m.Date;
938	0937 /* set microseconds to be dataversion # so that we approximate NFS-style
939	0938 * use of mtime as a dataversion #. We take it mod 512K because
940	0939 * microseconds must be less than a million, and 512K is the biggest
941	0940 * power of 2 less than such. DataVersions are typically pretty small
942	0941 * anyway, so the difference between 512K and 1000000 shouldn't matter
943	0942 * much, and "&" is a lot faster than "%".
944	0943 */
945	0944 #if defined(AFS_DARWIN_ENV) \|\| defined(AFS_FBSD_ENV)
946	0945 /* nfs on these systems puts an 0 in nsec and stores the nfs usec (aka
947	0946 * dataversion) in va_gen */
948	0947
949	0948
950	0949
951	0950 attrs->va_atime.tv_nsec = attrs->va_mtime.tv_nsec =
952	0951 attrs->va_ctime.tv_nsec = 0;
953	0952 attrs->va_gen = hgetlo(avc->m.DataVersion);
954	0953 #elif defined(AFS_SGI_ENV) \|\| defined(AFS_SUN5_ENV) \|\| defined(AFS_AIX41_ENV) \|\| defined(AFS_OBSD_ENV)
955	0954 attrs->va_atime.tv_nsec = attrs->va_mtime.tv_nsec =
956	0955 attrs->va_ctime.tv_nsec =
957	0956 (hgetlo(avc->m.DataVersion) & 0x7ffff) * 1000;
958	0957 #else
959	0958 attrs->va_atime.tv_usec = attrs->va_mtime.tv_usec =
960	0959 attrs->va_ctime.tv_usec = (hgetlo(avc->m.DataVersion) & 0x7ffff);
961	0960 #endif
962	0961 #if defined(AFS_DARWIN_ENV) \|\| defined(AFS_XBSD_ENV) \|\| defined(AFS_OSF_ENV)
963	0962 attrs->va_flags = 0;
964	0963 #endif
965	0964 #if defined(AFS_SGI_ENV) \|\| defined(AFS_SUN5_ENV)
966	0965 attrs->va_blksize = PAGESIZE; /* XXX Was 8192 XXX */
967	0966 #else
968	0967 attrs->va_blocksize = PAGESIZE; /* XXX Was 8192 XXX */
969	0968 #endif
970	0969 attrs->va_rdev = 1;
971	0970 #if defined(AFS_HPUX110_ENV)
972	0971 if (afs_globalVFS)
973	0972 attrs->va_fstype = afs_globalVFS->vfs_mtype;
974	0973 #endif
975	0974
976	0975 /*
977	0976 * Below return 0 (and not 1) blocks if the file is zero length. This conforms
978	0977 * better with the other filesystems that do return 0.
979	0978 */
980	0979 #if defined(AFS_OSF_ENV) \|\| defined(AFS_DARWIN_ENV) \|\| defined(AFS_XBSD_ENV)
981	0980 attrs->va_bytes = (attrs->va_size ? (attrs->va_size + 1023) : 1024);
982	0981 #ifdef va_bytes_rsv
983	0982 attrs->va_bytes_rsv = -1;
984	0983 #endif
985	0984 #elif defined(AFS_HPUX_ENV)
986	0985 attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10) : 0);
987	0986 #elif defined(AFS_SGI_ENV)
988	0987 attrs->va_blocks = BTOBB(attrs->va_size);
989	0988 #elif defined(AFS_SUN5_ENV)
990	0989 attrs->va_nblocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0);
991	0990 #else /* everything else */
992	0991 attrs->va_blocks = (attrs->va_size ? ((attrs->va_size + 1023)>>10)<<1:0);
993	0992 #endif
994	0993 + attrs->va_mode \|= 0100;
995	0994 return 0;
996	0995 }
997	0996 diff -U1000 -r orig-1.4.1/src/afs/afs_analyze.c scripts-1.4.1/src/afs/afs_analyze.c
998	0997 --- orig-1.4.1/src/afs/afs_analyze.c 2003-08-27 17:43:16.000000000 -0400
999	0998 +++ scripts-1.4.1/src/afs/afs_analyze.c 2006-10-02 17:35:12.000000000 -0400
1000	0999 /*------------------------------------------------------------------------
1001	1000 * EXPORTED afs_Analyze
1002	1001 *
1003	1002 * Description:
1004	1003 * Analyze the outcome of an RPC operation, taking whatever support
1005	1004 * actions are necessary.
1006	1005 *
1007	1006 * Arguments:
1008	1007 * aconn : Ptr to the relevant connection on which the call was made.
1009	1008 * acode : The return code experienced by the RPC.
1010	1009 * afid : The FID of the file involved in the action. This argument
1011	1010 * may be null if none was involved.
1012	1011 * areq : The request record associated with this operation.
1013	1012 * op : which RPC we are analyzing.
1014	1013 * cellp : pointer to a cell struct. Must provide either fid or cell.
1015	1014 *
1016	1015 * Returns:
1017	1016 * Non-zero value if the related RPC operation should be retried,
1018	1017 * zero otherwise.
1019	1018 *
1020	1019 * Environment:
1021	1020 * This routine is typically called in a do-while loop, causing the
1022	1021 * embedded RPC operation to be called repeatedly if appropriate
1023	1022 * until whatever error condition (if any) is intolerable.
1024	1023 *
1025	1024 * Side Effects:
1026	1025 * As advertised.
1027	1026 *
1028	1027 * NOTE:
1029	1028 * The retry return value is used by afs_StoreAllSegments to determine
1030	1029 * if this is a temporary or permanent error.
1031	1030 ------------------------------------------------------------------------/
1032	1031 int
1033	1032 afs_Analyze(register struct conn *aconn, afs_int32 acode,
1034	1033 struct VenusFid afid, register struct vrequest areq, int op,
1035	1034 afs_int32 locktype, struct cell *cellp)
1036	1035 {
1037	1036 afs_int32 i;
1038	1037 struct srvAddr *sa;
1039	1038 struct server *tsp;
1040	1039 struct volume *tvp;
1041	1040 afs_int32 shouldRetry = 0;
1042	1041 struct afs_stats_RPCErrors *aerrP;
1043	1042
1044	1043 AFS_STATCNT(afs_Analyze);
1045	1044 afs_Trace4(afs_iclSetp, CM_TRACE_ANALYZE, ICL_TYPE_INT32, op,
1046	1045 ICL_TYPE_POINTER, aconn, ICL_TYPE_INT32, acode, ICL_TYPE_LONG,
1047	1046 areq->uid);
1048	1047
1049	1048 aerrP = (struct afs_stats_RPCErrors *)0;
1050	1049
1051	1050 if ((op >= 0) && (op < AFS_STATS_NUM_FS_RPC_OPS))
1052	1051 aerrP = &(afs_stats_cmfullperf.rpc.fsRPCErrors[op]);
1053	1052
1054	1053 afs_FinalizeReq(areq);
1055	1054 if (!aconn && areq->busyCount) { /* one RPC or more got VBUSY/VRESTARTING */
1056	1055
1057	1056 tvp = afs_FindVolume(afid, READ_LOCK);
1058	1057 if (tvp) {
1059	1058 afs_warnuser("afs: Waiting for busy volume %u (%s) in cell %s\n",
1060	1059 (afid ? afid->Fid.Volume : 0),
1061	1060 (tvp->name ? tvp->name : ""),
1062	1061 ((tvp->serverHost[0]
1063	1062 && tvp->serverHost[0]->cell) ? tvp->serverHost[0]->
1064	1063 cell->cellName : ""));
1065	1064
1066	1065 for (i = 0; i < MAXHOSTS; i++) {
1067	1066 if (tvp->status[i] != not_busy && tvp->status[i] != offline) {
1068	1067 tvp->status[i] = not_busy;
1069	1068 }
1070	1069 if (tvp->status[i] == not_busy)
1071	1070 shouldRetry = 1;
1072	1071 }
1073	1072 afs_PutVolume(tvp, READ_LOCK);
1074	1073 } else {
1075	1074 afs_warnuser("afs: Waiting for busy volume %u\n",
1076	1075 (afid ? afid->Fid.Volume : 0));
1077	1076 }
1078	1077
1079	1078 - if (areq->busyCount > 100) {
1080	1079 + if (1) {
1081	1080 if (aerrP)
1082	1081 (aerrP->err_Volume)++;
1083	1082 areq->volumeError = VOLBUSY;
1084	1083 shouldRetry = 0;
1085	1084 } else {
1086	1085 VSleep(afs_BusyWaitPeriod); /* poll periodically */
1087	1086 }
1088	1087 if (shouldRetry != 0)
1089	1088 areq->busyCount++;
1090	1089
1091	1090 return shouldRetry; /* should retry */
1092	1091 }

Note: See TracBrowser for help on using the repository browser.

Download in other formats:

Original Format