[PATCH] fix devfs compile problems was Re: Linux v2.5.48

[Andi Kleen]

"Gabor Z. Papp" <[e-mail]> writes:

> 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

Side effect from the nsec stat patch. 
Here is a patch:

Linus, please consider applying.

-Andi

--- linux-2.5.48-work/fs/devfs/base.c-o	2002-11-18 13:39:07.000000000 +0100
+++ linux-2.5.48-work/fs/devfs/base.c	2002-11-18 13:41:12.000000000 +0100
@@ -3029,9 +3029,9 @@
     de->vfs_deletable = TRUE;
     de->inode.uid = current->euid;
     de->inode.gid = current->egid;
-    de->inode.atime = CURRENT_TIME;
-    de->inode.mtime = CURRENT_TIME;
-    de->inode.ctime = CURRENT_TIME;
+    de->inode.atime = get_seconds();
+    de->inode.mtime = get_seconds();
+    de->inode.ctime = get_seconds();
     if ( ( inode = _devfs_get_vfs_inode (dir->i_sb, de, dentry) ) == NULL )
 	return -ENOMEM;
     DPRINTK (DEBUG_DISABLED, "(%s): new VFS inode(%u): %p  dentry: %p\n",
@@ -3060,9 +3060,9 @@
 	return err;
     de->inode.uid = current->euid;
     de->inode.gid = current->egid;
-    de->inode.atime = CURRENT_TIME;
-    de->inode.mtime = CURRENT_TIME;
-    de->inode.ctime = CURRENT_TIME;
+    de->inode.atime = get_seconds();
+    de->inode.mtime = get_seconds();
+    de->inode.ctime = get_seconds();
     if ( ( inode = _devfs_get_vfs_inode (dir->i_sb, de, dentry) ) == NULL )
 	return -ENOMEM;
     DPRINTK (DEBUG_DISABLED, "(%s): new VFS inode(%u): %p  dentry: %p\n",
@@ -3129,9 +3129,9 @@
 	return err;
     de->inode.uid = current->euid;
     de->inode.gid = current->egid;
-    de->inode.atime = CURRENT_TIME;
-    de->inode.mtime = CURRENT_TIME;
-    de->inode.ctime = CURRENT_TIME;
+    de->inode.atime = get_seconds();
+    de->inode.mtime = get_seconds();
+    de->inode.ctime = get_seconds();
     if ( ( inode = _devfs_get_vfs_inode (dir->i_sb, de, dentry) ) == NULL )
 	return -ENOMEM;
     DPRINTK (DEBUG_I_MKNOD, ":   new VFS inode(%u): %p  dentry: %p\n",

-Andi