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
6 char * coda_f2s(struct CodaFid *f)
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]);
13 sprintf(s, "(%08x.%08x.%08x.%08x)", f->opaque[0], f->opaque[1], f->opaque[2],
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
21 printk(KERN_INFO "Coda Kernel/Venus communications, "
22 -#ifdef CODA_FS_OLD_API
23 +#ifdef CONFIG_CODA_FS_OLD_API
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
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;
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, };
52 -#ifdef CODA_FS_OLD_API
53 +#ifdef CONFIG_CODA_FS_OLD_API
54 memcpy(&(inp->ih.cred), &cred, sizeof(cred));
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, };
67 insize = SIZE(release);
70 -#ifdef CODA_FS_OLD_API
71 +#ifdef CONFIG_CODA_FS_OLD_API
72 memcpy(&(inp->ih.cred), &cred, sizeof(cred));
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
80 typedef u_int32_t vgid_t;
83 -#ifdef CODA_FS_OLD_API
84 +#ifdef CONFIG_CODA_FS_OLD_API
89 vgid_t cr_groupid, cr_egid, cr_sgid, cr_fsgid; /* same for groups */
92 -#else /* not defined(CODA_FS_OLD_API) */
93 +#else /* not defined(CONFIG_CODA_FS_OLD_API) */
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 */
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 */
105 #define CODA_KERNEL_VERSION 3 /* 128-bit file identifiers */
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 */
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;