2002-11-18 06:06:29

by Alex Goddard

Subject: 2.5.48 Compilation Failure

During make bzImage:

gcc -Wp,-MD,fs/devfs/.base.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=athlon -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DKBUILD_BASENAME=base -DKBUILD_MODNAME=devfs -DEXPORT_SYMTAB -c -o
fs/devfs/base.o fs/devfs/base.c
fs/devfs/base.c: In function `devfs_symlink':
fs/devfs/base.c:3032: incompatible types in assignment
fs/devfs/base.c:3033: incompatible types in assignment
fs/devfs/base.c:3034: incompatible types in assignment
fs/devfs/base.c: In function `devfs_mkdir':
fs/devfs/base.c:3063: incompatible types in assignment
fs/devfs/base.c:3064: incompatible types in assignment
fs/devfs/base.c:3065: incompatible types in assignment
fs/devfs/base.c: In function `devfs_mknod':
fs/devfs/base.c:3132: incompatible types in assignment
fs/devfs/base.c:3133: incompatible types in assignment
fs/devfs/base.c:3134: incompatible types in assignment
make[2]: *** [fs/devfs/base.o] Error 1
make[1]: *** [fs/devfs] Error 2
make: *** [fs] Error 2

I'm unsure of exactly what other information would be needed by whomever
will go after this, but just say something and I'll send what you want.

--
Alex Goddard
[email protected]

2002-11-18 06:21:49

by Paul Erkkila

Subject: Re: 2.5.48 Compilation Failure

This will make it compile, and boot

I'll forwarn i have no idea wtf i'm doing , so you might
want to wait for a different patch... o.0

diff -Nru a/fs/devfs/base.c b/fs/devfs/base.c
--- a/fs/devfs/base.c Mon Nov 18 06:20:34 2002
+++ b/fs/devfs/base.c Mon Nov 18 06:20:34 2002
@@ -799,9 +799,9 @@
struct devfs_inode /* This structure is for "persistent" inode storage */
{
struct dentry *dentry;
- time_t atime;
- time_t mtime;
- time_t ctime;
+ struct timespec atime;
+ struct timespec mtime;
+ struct timespec ctime;
unsigned int ino; /* Inode number as seen in the VFS */
uid_t uid;
gid_t gid;
@@ -2509,9 +2509,9 @@
de->mode = inode->i_mode;
de->inode.uid = inode->i_uid;
de->inode.gid = inode->i_gid;
- de->inode.atime = inode->i_atime.tv_sec;
- de->inode.mtime = inode->i_mtime.tv_sec;
- de->inode.ctime = inode->i_ctime.tv_sec;
+ de->inode.atime.tv_sec = inode->i_atime.tv_sec;
+ de->inode.mtime.tv_sec = inode->i_mtime.tv_sec;
+ de->inode.ctime.tv_sec = inode->i_ctime.tv_sec;
if ( ( iattr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID) ) &&
!is_devfsd_or_child (fs_info) )
devfsd_notify_de (de, DEVFSD_NOTIFY_CHANGE, inode->i_mode,
@@ -2610,9 +2610,9 @@
inode->i_mode = de->mode;
inode->i_uid = de->inode.uid;
inode->i_gid = de->inode.gid;
- inode->i_atime.tv_sec = de->inode.atime;
- inode->i_mtime.tv_sec = de->inode.mtime;
- inode->i_ctime.tv_sec = de->inode.ctime;
+ inode->i_atime.tv_sec = de->inode.atime.tv_sec;
+ inode->i_mtime.tv_sec = de->inode.mtime.tv_sec;
+ inode->i_ctime.tv_sec = de->inode.ctime.tv_sec;
inode->i_atime.tv_nsec = 0;
inode->i_mtime.tv_nsec = 0;
inode->i_ctime.tv_nsec = 0;



Alex Goddard wrote:

>During make bzImage:
>
>gcc -Wp,-MD,fs/devfs/.base.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=athlon -Iarch/i386/mach-generic -nostdinc -iwithprefix include
>-DKBUILD_BASENAME=base -DKBUILD_MODNAME=devfs -DEXPORT_SYMTAB -c -o
>fs/devfs/base.o fs/devfs/base.c
>fs/devfs/base.c: In function `devfs_symlink':
>fs/devfs/base.c:3032: incompatible types in assignment
>fs/devfs/base.c:3033: incompatible types in assignment
>fs/devfs/base.c:3034: incompatible types in assignment
>fs/devfs/base.c: In function `devfs_mkdir':
>fs/devfs/base.c:3063: incompatible types in assignment
>fs/devfs/base.c:3064: incompatible types in assignment
>fs/devfs/base.c:3065: incompatible types in assignment
>fs/devfs/base.c: In function `devfs_mknod':
>fs/devfs/base.c:3132: incompatible types in assignment
>fs/devfs/base.c:3133: incompatible types in assignment
>fs/devfs/base.c:3134: incompatible types in assignment
>make[2]: *** [fs/devfs/base.o] Error 1
>make[1]: *** [fs/devfs] Error 2
>make: *** [fs] Error 2
>
>I'm unsure of exactly what other information would be needed by whomever
>will go after this, but just say something and I'll send what you want.
>
>
>

2002-11-18 12:29:28

by Petr Vandrovec

Subject: Re: 2.5.48 Compilation Failure

> diff -Nru a/fs/devfs/base.c b/fs/devfs/base.c
> --- a/fs/devfs/base.c Mon Nov 18 06:20:34 2002
> +++ b/fs/devfs/base.c Mon Nov 18 06:20:34 2002
> @@ -2509,9 +2509,9 @@
> de->mode = inode->i_mode;
> de->inode.uid = inode->i_uid;
> de->inode.gid = inode->i_gid;
> - de->inode.atime = inode->i_atime.tv_sec;
> - de->inode.mtime = inode->i_mtime.tv_sec;
> - de->inode.ctime = inode->i_ctime.tv_sec;
> + de->inode.atime.tv_sec = inode->i_atime.tv_sec;
> + de->inode.mtime.tv_sec = inode->i_mtime.tv_sec;
> + de->inode.ctime.tv_sec = inode->i_ctime.tv_sec;

No, just do
de->inode.xtime = inode->i_xtime;
gcc will copy whole structure automatically. Otherwise
uninitialized tv_nsec can contain value > 999999999us and it
is not legal.

> - inode->i_atime.tv_sec = de->inode.atime;
> - inode->i_mtime.tv_sec = de->inode.mtime;
> - inode->i_ctime.tv_sec = de->inode.ctime;
> + inode->i_atime.tv_sec = de->inode.atime.tv_sec;
> + inode->i_mtime.tv_sec = de->inode.mtime.tv_sec;
> + inode->i_ctime.tv_sec = de->inode.ctime.tv_sec;
> inode->i_atime.tv_nsec = 0;
> inode->i_mtime.tv_nsec = 0;
> inode->i_ctime.tv_nsec = 0;

And here other way around. Just do
inode->i_xtime = de->inode.xtime;
and remove assigning of zero to tv_nsec.

Although there is question, why devfs cannot use inode directly.
Due to memory consumption?
Thanks,
Petr Vandrovec
[email protected]