]>
Commit | Line | Data |
---|---|---|
8117dcc5 | 1 | diff -urN linux-2.6.0-test9/fs/coda/coda_linux.c |
2 | linux-2.6.0-test9-coda/fs/coda/coda_linux.c | |
3 | --- linux-2.6.0-test9/fs/coda/coda_linux.c 2003-09-28 23:43:44.000000000 -0400 | |
4 | +++ linux-2.6.0-test9-coda/fs/coda/coda_linux.c 2003-10-29 11:12:26.000000000 -0500 | |
5 | @@ -28,7 +28,7 @@ | |
6 | char * coda_f2s(struct CodaFid *f) | |
7 | { | |
8 | static char s[60]; | |
9 | -#ifdef CODA_FS_OLD_API | |
10 | +#ifdef CONFIG_CODA_FS_OLD_API | |
11 | sprintf(s, "(%08x.%08x.%08x)", f->opaque[0], f->opaque[1], f->opaque[2]); | |
12 | #else | |
13 | sprintf(s, "(%08x.%08x.%08x.%08x)", f->opaque[0], f->opaque[1], f->opaque[2], | |
14 | f->opaque[3]); | |
15 | diff -urN linux-2.6.0-test9/fs/coda/psdev.c linux-2.6.0-test9-coda/fs/coda/psdev.c | |
16 | --- linux-2.6.0-test9/fs/coda/psdev.c 2003-09-28 23:43:44.000000000 -0400 | |
17 | +++ linux-2.6.0-test9-coda/fs/coda/psdev.c 2003-10-29 11:12:31.000000000 -0500 | |
18 | @@ -385,7 +385,7 @@ | |
19 | int status; | |
20 | int i; | |
21 | printk(KERN_INFO "Coda Kernel/Venus communications, " | |
22 | -#ifdef CODA_FS_OLD_API | |
23 | +#ifdef CONFIG_CODA_FS_OLD_API | |
24 | "v5.3.20" | |
25 | #else | |
26 | "v6.0.0" | |
27 | diff -urN linux-2.6.0-test9/fs/coda/upcall.c linux-2.6.0-test9-coda/fs/coda/upcall.c | |
28 | --- linux-2.6.0-test9/fs/coda/upcall.c 2003-09-28 23:43:44.000000000 -0400 | |
29 | +++ linux-2.6.0-test9-coda/fs/coda/upcall.c 2003-10-29 11:12:55.000000000 -0500 | |
30 | @@ -55,7 +55,7 @@ | |
31 | inp->ih.opcode = opcode; | |
32 | inp->ih.pid = current->pid; | |
33 | inp->ih.pgid = process_group(current); | |
34 | -#ifdef CODA_FS_OLD_API | |
35 | +#ifdef CONFIG_CODA_FS_OLD_API | |
36 | memset(&inp->ih.cred, 0, sizeof(struct coda_cred)); | |
37 | inp->ih.cred.cr_fsuid = current->fsuid; | |
38 | #else | |
39 | @@ -172,7 +172,7 @@ | |
40 | union inputArgs *inp; | |
41 | union outputArgs *outp; | |
42 | int insize, outsize, error; | |
43 | -#ifdef CODA_FS_OLD_API | |
44 | +#ifdef CONFIG_CODA_FS_OLD_API | |
45 | struct coda_cred cred = { 0, }; | |
46 | cred.cr_fsuid = uid; | |
47 | #endif | |
48 | @@ -180,7 +180,7 @@ | |
49 | insize = SIZE(store); | |
50 | UPARG(CODA_STORE); | |
51 | ||
52 | -#ifdef CODA_FS_OLD_API | |
53 | +#ifdef CONFIG_CODA_FS_OLD_API | |
54 | memcpy(&(inp->ih.cred), &cred, sizeof(cred)); | |
55 | #else | |
56 | inp->ih.uid = uid; | |
57 | @@ -219,7 +219,7 @@ | |
58 | union inputArgs *inp; | |
59 | union outputArgs *outp; | |
60 | int insize, outsize, error; | |
61 | -#ifdef CODA_FS_OLD_API | |
62 | +#ifdef CONFIG_CODA_FS_OLD_API | |
63 | struct coda_cred cred = { 0, }; | |
64 | cred.cr_fsuid = uid; | |
65 | #endif | |
66 | @@ -227,7 +227,7 @@ | |
67 | insize = SIZE(release); | |
68 | UPARG(CODA_CLOSE); | |
69 | ||
70 | -#ifdef CODA_FS_OLD_API | |
71 | +#ifdef CONFIG_CODA_FS_OLD_API | |
72 | memcpy(&(inp->ih.cred), &cred, sizeof(cred)); | |
73 | #else | |
74 | inp->ih.uid = uid; | |
75 | diff -urN linux-2.6.0-test9/include/linux/coda.h | |
76 | linux-2.6.0-test9-coda/include/linux/coda.h | |
77 | --- linux-2.6.0-test9/include/linux/coda.h 2003-09-28 23:44:08.000000000 -0400 | |
78 | +++ linux-2.6.0-test9-coda/include/linux/coda.h 2003-10-29 11:11:50.000000000 -0500 | |
79 | @@ -200,7 +200,7 @@ | |
80 | typedef u_int32_t vgid_t; | |
81 | #endif /*_VUID_T_ */ | |
82 | ||
83 | -#ifdef CODA_FS_OLD_API | |
84 | +#ifdef CONFIG_CODA_FS_OLD_API | |
85 | struct CodaFid { | |
86 | u_int32_t opaque[3]; | |
87 | }; | |
88 | @@ -220,7 +220,7 @@ | |
89 | vgid_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */ | |
90 | }; | |
91 | ||
92 | -#else /* not defined(CODA_FS_OLD_API) */ | |
93 | +#else /* not defined(CONFIG_CODA_FS_OLD_API) */ | |
94 | ||
95 | struct CodaFid { | |
96 | u_int32_t opaque[4]; | |
97 | @@ -318,7 +318,7 @@ | |
98 | #define CODA_KERNEL_VERSION 0 /* don't care about kernel version number */ | |
99 | #define CODA_KERNEL_VERSION 1 /* The old venus 4.6 compatible interface */ | |
100 | #endif | |
101 | -#ifdef CODA_FS_OLD_API | |
102 | +#ifdef CONFIG_CODA_FS_OLD_API | |
103 | #define CODA_KERNEL_VERSION 2 /* venus_lookup got an extra parameter */ | |
104 | #else | |
105 | #define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */ | |
106 | @@ -330,7 +330,7 @@ | |
107 | struct coda_in_hdr { | |
108 | u_int32_t opcode; | |
109 | u_int32_t unique; /* Keep multiple outstanding msgs distinct */ | |
110 | -#ifdef CODA_FS_OLD_API | |
111 | +#ifdef CONFIG_CODA_FS_OLD_API | |
112 | u_int16_t pid; /* Common to all */ | |
113 | u_int16_t pgid; /* Common to all */ | |
114 | u_int16_t sid; /* Common to all */ | |
115 | @@ -614,7 +614,7 @@ | |
116 | /* CODA_PURGEUSER is a venus->kernel call */ | |
117 | struct coda_purgeuser_out { | |
118 | struct coda_out_hdr oh; | |
119 | -#ifdef CODA_FS_OLD_API | |
120 | +#ifdef CONFIG_CODA_FS_OLD_API | |
121 | struct coda_cred cred; | |
122 | #else | |
123 | vuid_t uid; |