Fix nanosecond merge.

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 1b2f43766651fb2faa26d919f6810e6de0736997..418b1b00cb7df2862ad417d483e0d8eef254e371 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -188,9 +188,9 @@ int jffs2_setattr (struct dentry *dentry, struct iattr *iattr)
                return PTR_ERR(new_metadata);
        }
        /* It worked. Update the inode */
-       inode->i_atime = je32_to_cpu(ri->atime.tv_sec);
-       inode->i_ctime = je32_to_cpu(ri->ctime.tv_sec);
-       inode->i_mtime = je32_to_cpu(ri->mtime.tv_sec);
+       inode->i_atime.tv_sec = je32_to_cpu(ri->atime);
+       inode->i_ctime.tv_sec = je32_to_cpu(ri->ctime);
+       inode->i_mtime.tv_sec = je32_to_cpu(ri->mtime);
        inode->i_atime.tv_nsec =
        inode->i_ctime.tv_nsec =
        inode->i_mtime.tv_nsec = 0;

diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 231d028bea50f49d3c73ef18960e495de3b4bd0b..2fed2c33e36d2426c9ac7345b4c6b3baab672704 100644 (file)
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -90,9 +90,9 @@ void jffs2_read_inode (struct inode *inode)
        inode->i_uid = je16_to_cpu(latest_node.uid);
        inode->i_gid = je16_to_cpu(latest_node.gid);
        inode->i_size = je32_to_cpu(latest_node.isize);
-       inode->i_atime = je32_to_cpu(latest_node.atime);
-       inode->i_mtime = je32_to_cpu(latest_node.mtime);
-       inode->i_ctime = je32_to_cpu(latest_node.ctime);
+       inode->i_atime.tv_sec = je32_to_cpu(latest_node.atime);
+       inode->i_mtime.tv_sec = je32_to_cpu(latest_node.mtime);
+       inode->i_ctime.tv_sec = je32_to_cpu(latest_node.ctime);
        inode->i_atime.tv_nsec =
        inode->i_mtime.tv_nsec =
        inode->i_ctime.tv_nsec = 0;