mtd/fs/jffs2 fs.c,1.54,1.55

[gleixner at infradead.org]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv30824

Modified Files:
	fs.c 
Log Message:
Missed bit from mainstream merge

[PATCH] Sync in core time granuality with filesystems

Signed-off-by: Andi Kleen <ak at suse.de>



Index: fs.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/fs.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- fs.c	17 Mar 2005 20:23:06 -0000	1.54
+++ fs.c	18 Mar 2005 10:17:18 -0000	1.55
@@ -428,7 +428,7 @@
 	inode->i_mode = jemode_to_cpu(ri->mode);
 	inode->i_gid = je16_to_cpu(ri->gid);
 	inode->i_uid = je16_to_cpu(ri->uid);
-	inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+	inode->i_atime = inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
 	ri->atime = ri->mtime = ri->ctime = cpu_to_je32(I_SEC(inode->i_mtime));
 
 	inode->i_blksize = PAGE_SIZE;