jffs2: convert to new timestamp accessors

[linux-2.6-microblaze.git] / fs / jffs2 / dir.c

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 091ab0e..2b29389 100644 (file)
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -204,8 +204,8 @@ static int jffs2_create(struct mnt_idmap *idmap, struct inode *dir_i,
        if (ret)
                goto fail;
 
-       dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
-                                              ITIME(je32_to_cpu(ri->ctime)));
+       inode_set_mtime_to_ts(dir_i,
+                             inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(ri->ctime))));
 
        jffs2_free_raw_inode(ri);
 
@@ -238,7 +238,8 @@ static int jffs2_unlink(struct inode *dir_i, struct dentry *dentry)
        if (dead_f->inocache)
                set_nlink(d_inode(dentry), dead_f->inocache->pino_nlink);
        if (!ret)
-               dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+               inode_set_mtime_to_ts(dir_i,
+                                     inode_set_ctime_to_ts(dir_i, ITIME(now)));
        return ret;
 }
 /***********************************************************************/
@@ -272,7 +273,8 @@ static int jffs2_link (struct dentry *old_dentry, struct inode *dir_i, struct de
                set_nlink(d_inode(old_dentry), ++f->inocache->pino_nlink);
                mutex_unlock(&f->sem);
                d_instantiate(dentry, d_inode(old_dentry));
-               dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+               inode_set_mtime_to_ts(dir_i,
+                                     inode_set_ctime_to_ts(dir_i, ITIME(now)));
                ihold(d_inode(old_dentry));
        }
        return ret;
@@ -423,8 +425,8 @@ static int jffs2_symlink (struct mnt_idmap *idmap, struct inode *dir_i,
                goto fail;
        }
 
-       dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
-                                              ITIME(je32_to_cpu(rd->mctime)));
+       inode_set_mtime_to_ts(dir_i,
+                             inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
 
        jffs2_free_raw_dirent(rd);
 
@@ -568,8 +570,8 @@ static int jffs2_mkdir (struct mnt_idmap *idmap, struct inode *dir_i,
                goto fail;
        }
 
-       dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
-                                              ITIME(je32_to_cpu(rd->mctime)));
+       inode_set_mtime_to_ts(dir_i,
+                             inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
        inc_nlink(dir_i);
 
        jffs2_free_raw_dirent(rd);
@@ -610,7 +612,8 @@ static int jffs2_rmdir (struct inode *dir_i, struct dentry *dentry)
        ret = jffs2_do_unlink(c, dir_f, dentry->d_name.name,
                              dentry->d_name.len, f, now);
        if (!ret) {
-               dir_i->i_mtime = inode_set_ctime_to_ts(dir_i, ITIME(now));
+               inode_set_mtime_to_ts(dir_i,
+                                     inode_set_ctime_to_ts(dir_i, ITIME(now)));
                clear_nlink(d_inode(dentry));
                drop_nlink(dir_i);
        }
@@ -746,8 +749,8 @@ static int jffs2_mknod (struct mnt_idmap *idmap, struct inode *dir_i,
                goto fail;
        }
 
-       dir_i->i_mtime = inode_set_ctime_to_ts(dir_i,
-                                              ITIME(je32_to_cpu(rd->mctime)));
+       inode_set_mtime_to_ts(dir_i,
+                             inode_set_ctime_to_ts(dir_i, ITIME(je32_to_cpu(rd->mctime))));
 
        jffs2_free_raw_dirent(rd);
 
@@ -868,16 +871,18 @@ static int jffs2_rename (struct mnt_idmap *idmap,
                 * caller won't do it on its own since we are returning an error.
                 */
                d_invalidate(new_dentry);
-               new_dir_i->i_mtime = inode_set_ctime_to_ts(new_dir_i,
-                                                          ITIME(now));
+               inode_set_mtime_to_ts(new_dir_i,
+                                     inode_set_ctime_to_ts(new_dir_i, ITIME(now)));
                return ret;
        }
 
        if (d_is_dir(old_dentry))
                drop_nlink(old_dir_i);
 
-       old_dir_i->i_mtime = inode_set_ctime_to_ts(old_dir_i, ITIME(now));
-       new_dir_i->i_mtime = inode_set_ctime_to_ts(new_dir_i, ITIME(now));
+       inode_set_mtime_to_ts(old_dir_i,
+                             inode_set_ctime_to_ts(old_dir_i, ITIME(now)));
+       inode_set_mtime_to_ts(new_dir_i,
+                             inode_set_ctime_to_ts(new_dir_i, ITIME(now)));
 
        return 0;
 }