[OpenAFS] 1.3.77 under AIX 5.1: unusable
Hans-Gunther Borrmann
hans-gunther.borrmann@rz.uni-freiburg.de
Wed, 9 Feb 2005 15:41:31 +0100
On Monday 07 February 2005 15:34, Derrick J Brashear wrote:
> [stuff about the server deleted. one thing at a time]
true.
> Really, I'd like to try this, and Sven Oehme was even kind enough to send
> a machine... which I need to get out of customs, which I'm sure is going
> to be like getting teeth pulled.
>
> You can try applying /afs/andrew.cmu.edu/usr/shadow/hzr-diff1 and
> hzr-diff2 in reverse, build, and see if it makes a difference. There is
> little of substance there. If it works, it should be easy to figure out
> why. If not, I don't know. Those are diffs of Hartmut's CVS tree against
> OpenAFS 1.3.77-ish CVS head.
>
I tried to apply your 2 diffs but failed. Many many hunks fail because the
context is not found in my sources due to missing or adittional blanks. Two
examples:
_____________________________________________________________
Output from patch:
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -xCVS -urtw openafs/src/afs/AIX/osi_config.c /usr/tmp/openafs/src/afs/
AIX/osi_config.c
|--- openafs/src/afs/AIX/osi_config.c Sat Nov 4 05:03:16 2000
|+++ /usr/tmp/openafs/src/afs/AIX/osi_config.c Thu Aug 19 01:42:24 2004
--------------------------
Patching file openafs/src/afs/AIX/osi_config.c using Plan A...
Hunk #1 succeeded at 33.
Hunk #2 succeeded at 53.
Hunk #3 succeeded at 65.
Hunk #4 succeeded at 85.
Hunk #5 succeeded at 133.
Hunk #6 succeeded at 161.
Hunk #7 succeeded at 170.
Hunk #8 FAILED at 257.
Hunk #9 succeeded at 282 with fuzz 2.
Hunk #10 FAILED at 290.
Hunk #11 FAILED at 320.
Hunk #12 FAILED at 329.
4 out of 12 hunks FAILED -- saving rejects to file openafs/src/afs/AIX/
osi_config.c.rej
________________________________________________________________
The 2 first failing hunks:
@@ -284,24 +257,17 @@
{ (void *) &vnodefops, "vnodefops" },
{ (void *) &ifnet, "ifnet" },
{ (void *) &jfs_icache_lock, "jfs_icache_lock" },
-#ifndef AFS_AIX51_ENV
{ (void *) &proc_tbl_lock, "proc_tbl_lock" },
-#endif
{ 0, 0 },
};
.........................................
@@ -325,31 +290,27 @@
fpalloc(vp, flag, type, ops, fpp)
struct vnode *vp;
struct fileops *ops;
- struct file **fpp;
-{
+struct file **fpp; {
................................
_________________________________________________________________
The source lines corresponding to the context lines:
{(void *)&vnodefops, "vnodefops"},
{(void *)&ifnet, "ifnet"},
{(void *)&jfs_icache_lock, "jfs_icache_lock"},
#ifndef AFS_AIX51_ENV
{(void *)&proc_tbl_lock, "proc_tbl_lock"},
#endif
{0, 0},
and:
fpalloc(vp, flag, type, ops, fpp)
struct vnode *vp;
struct fileops *ops;
struct file **fpp;
__________________________________________________________________
My sources are from openafs-snap-2005-01-17.tar.gz
What to do?
Gunther
--
________________________________________________________________
Hans-Gunther Borrmann <hans-gunther.borrmann@rz.uni-freiburg.de>
Rechenzentrum der Universitaet Freiburg
Hermann-Herder-Str. 10, D79104 FREIBURG
Tel.: +49 761/203-4652
Fax: +49 761/203-4643