* [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
@ 2002-10-23 9:56 Jan Marek
2002-10-23 10:28 ` Alan Cox
0 siblings, 1 reply; 6+ messages in thread
From: Jan Marek @ 2002-10-23 9:56 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
Hallo lkml,
I'm sending 2 patches to fix compilation errors in the AFS fs.
The first of them fixed union afs_dirent_t and using this union in the
fs/afs/dir.c.
The second of them fix number of parameters of calling function kleave()
in the net/rxpc/main.c.
Sincerely
Jan Marek
--
Ing. Jan Marek
University of South Bohemia
Academic Computer Centre
Phone: +420-38-7772080
[-- Attachment #2: fs_afs_dirc.patch --]
[-- Type: text/plain, Size: 1142 bytes --]
--- linux-2.5.44/fs/afs/dir.c.old 2002-10-23 11:35:12.000000000 +0200
+++ linux-2.5.44/fs/afs/dir.c 2002-10-23 11:39:57.000000000 +0200
@@ -72,7 +72,7 @@
u8 name[16];
u8 overflow[4]; /* if any char of the name (inc NUL) reaches here, consume
* the next dirent too */
- };
+ } parts;
u8 extended_name[32];
} afs_dirent_t;
@@ -258,7 +258,7 @@
/* got a valid entry */
dire = &block->dirents[offset];
- nlen = strnlen(dire->name,sizeof(*block) - offset*sizeof(afs_dirent_t));
+ nlen = strnlen(dire->parts.name,sizeof(*block) - offset*sizeof(afs_dirent_t));
_debug("ENT[%u.%u]: %s %u \"%.*s\"\n",
blkoff/sizeof(afs_dir_block_t),offset,
@@ -290,11 +290,11 @@
/* found the next entry */
ret = filldir(cookie,
- dire->name,
+ dire->parts.name,
nlen,
blkoff + offset * sizeof(afs_dirent_t),
- ntohl(dire->vnode),
- filldir==afs_dir_lookup_filldir ? dire->unique : DT_UNKNOWN);
+ ntohl(dire->parts.vnode),
+ filldir==afs_dir_lookup_filldir ? dire->parts.unique : DT_UNKNOWN);
if (ret<0) {
_leave(" = 0 [full]");
return 0;
[-- Attachment #3: net_rxpc_mainc.patch --]
[-- Type: text/plain, Size: 394 bytes --]
--- linux-2.5.44/net/rxrpc/main.c.old 2002-10-23 11:44:45.000000000 +0200
+++ linux-2.5.44/net/rxrpc/main.c 2002-10-23 11:45:41.000000000 +0200
@@ -123,5 +123,5 @@
__RXACCT(printk("Outstanding Peers : %d\n",atomic_read(&rxrpc_peer_count)));
__RXACCT(printk("Outstanding Transports : %d\n",atomic_read(&rxrpc_transport_count)));
- kleave();
+ kleave("");
} /* end rxrpc_cleanup() */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
2002-10-23 9:56 [miniPATCH] 2.5.44 fix compilation errors in the AFS fs Jan Marek
@ 2002-10-23 10:28 ` Alan Cox
2002-10-23 10:42 ` Alex Riesen
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alan Cox @ 2002-10-23 10:28 UTC (permalink / raw)
To: Jan Marek; +Cc: Linux Kernel Mailing List
On Wed, 2002-10-23 at 10:56, Jan Marek wrote:
> Hallo lkml,
>
> I'm sending 2 patches to fix compilation errors in the AFS fs.
>
> The first of them fixed union afs_dirent_t and using this union in the
> fs/afs/dir.c.
>
What compiler are you using, this is building fine with the gcc's I
have. Is it 2.95 ?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
2002-10-23 10:28 ` Alan Cox
@ 2002-10-23 10:42 ` Alex Riesen
2002-10-23 11:53 ` Alan Cox
2002-10-23 10:44 ` Adrian Bunk
2002-10-23 13:16 ` David S. Miller
2 siblings, 1 reply; 6+ messages in thread
From: Alex Riesen @ 2002-10-23 10:42 UTC (permalink / raw)
To: Alan Cox; +Cc: Jan Marek, Linux Kernel Mailing List
On Wed, Oct 23, 2002 at 11:28:16AM +0100, Alan Cox wrote:
> On Wed, 2002-10-23 at 10:56, Jan Marek wrote:
> > The first of them fixed union afs_dirent_t and using this union in the
> > fs/afs/dir.c.
>
> What compiler are you using, this is building fine with the gcc's I
> have. Is it 2.95 ?
It doesn't compile with 2.95.4 from debian's 2.95.4-12. It does compile
with gcc-3.x, where unnamed struct/union members seem to be introduced.
-alex
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
2002-10-23 10:28 ` Alan Cox
2002-10-23 10:42 ` Alex Riesen
@ 2002-10-23 10:44 ` Adrian Bunk
2002-10-23 13:16 ` David S. Miller
2 siblings, 0 replies; 6+ messages in thread
From: Adrian Bunk @ 2002-10-23 10:44 UTC (permalink / raw)
To: Alan Cox; +Cc: Jan Marek, Linux Kernel Mailing List
On 23 Oct 2002, Alan Cox wrote:
> On Wed, 2002-10-23 at 10:56, Jan Marek wrote:
> > Hallo lkml,
> >
> > I'm sending 2 patches to fix compilation errors in the AFS fs.
> >
> > The first of them fixed union afs_dirent_t and using this union in the
> > fs/afs/dir.c.
> >
>
> What compiler are you using, this is building fine with the gcc's I
> have. Is it 2.95 ?
Most likely. Below is the error I see when trying to compile this file
with 2.95:
<-- snip -->
...
gcc -Wp,-MD,fs/afs/.dir.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc
-iwithprefix include -DKBUILD_BASENAME=dir -c -o fs/afs/dir.o fs/afs/dir.c
fs/afs/dir.c:75: warning: unnamed struct/union that defines no instances
fs/afs/dir.c: In function `afs_dir_iterate_block':
fs/afs/dir.c:261: union has no member named `name'
fs/afs/dir.c:293: union has no member named `name'
fs/afs/dir.c:296: union has no member named `vnode'
fs/afs/dir.c:296: union has no member named `vnode'
fs/afs/dir.c:296: union has no member named `vnode'
fs/afs/dir.c:297: union has no member named `unique'
make[2]: *** [fs/afs/dir.o] Error 1
<-- snip -->
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
2002-10-23 10:42 ` Alex Riesen
@ 2002-10-23 11:53 ` Alan Cox
0 siblings, 0 replies; 6+ messages in thread
From: Alan Cox @ 2002-10-23 11:53 UTC (permalink / raw)
To: Alexander.Riesen; +Cc: Jan Marek, Linux Kernel Mailing List
On Wed, 2002-10-23 at 11:42, Alex Riesen wrote:
> On Wed, Oct 23, 2002 at 11:28:16AM +0100, Alan Cox wrote:
> > On Wed, 2002-10-23 at 10:56, Jan Marek wrote:
> > > The first of them fixed union afs_dirent_t and using this union in the
> > > fs/afs/dir.c.
> >
> > What compiler are you using, this is building fine with the gcc's I
> > have. Is it 2.95 ?
>
> It doesn't compile with 2.95.4 from debian's 2.95.4-12. It does compile
> with gcc-3.x, where unnamed struct/union members seem to be introduced.
Makes sense then. Applied
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [miniPATCH] 2.5.44 fix compilation errors in the AFS fs
2002-10-23 10:28 ` Alan Cox
2002-10-23 10:42 ` Alex Riesen
2002-10-23 10:44 ` Adrian Bunk
@ 2002-10-23 13:16 ` David S. Miller
2 siblings, 0 replies; 6+ messages in thread
From: David S. Miller @ 2002-10-23 13:16 UTC (permalink / raw)
To: Alan Cox; +Cc: Jan Marek, Linux Kernel Mailing List
On Wed, 2002-10-23 at 03:28, Alan Cox wrote:
> On Wed, 2002-10-23 at 10:56, Jan Marek wrote:
> > The first of them fixed union afs_dirent_t and using this union in the
> > fs/afs/dir.c.
> >
>
> What compiler are you using, this is building fine with the gcc's I
> have. Is it 2.95 ?
David Howells has a full set of patches to clean up the
2.95 issues in AFS, they just didn't get integrated before
Linus took off.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2002-10-23 12:58 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-10-23 9:56 [miniPATCH] 2.5.44 fix compilation errors in the AFS fs Jan Marek
2002-10-23 10:28 ` Alan Cox
2002-10-23 10:42 ` Alex Riesen
2002-10-23 11:53 ` Alan Cox
2002-10-23 10:44 ` Adrian Bunk
2002-10-23 13:16 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®