affs: convert to new i_version API

Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index 0f0e6925e97dd123cc03f991f33f998599e57e5c..14a6c1b90c9fb8e0652ad848fa46536cfd96484b 100644 (file)
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/math64.h>
+#include <linux/iversion.h>
 #include "affs.h"
 
 /*
@@ -60,7 +61,7 @@ affs_insert_hash(struct inode *dir, struct buffer_head *bh)
        affs_brelse(dir_bh);
 
        dir->i_mtime = dir->i_ctime = current_time(dir);
-       dir->i_version++;
+       inode_inc_iversion(dir);
        mark_inode_dirty(dir);
 
        return 0;
@@ -114,7 +115,7 @@ affs_remove_hash(struct inode *dir, struct buffer_head *rem_bh)
        affs_brelse(bh);
 
        dir->i_mtime = dir->i_ctime = current_time(dir);
-       dir->i_version++;
+       inode_inc_iversion(dir);
        mark_inode_dirty(dir);
 
        return retval;

diff --git a/fs/affs/dir.c b/fs/affs/dir.c
index a105e77df2c10b818bb4134b7fa6cf2075db34d4..d180b46453cf9ae2be22948a1036b8e36d4e994c 100644 (file)
--- a/fs/affs/dir.c
+++ b/fs/affs/dir.c
@@ -14,6 +14,7 @@
  *
  */
 
+#include <linux/iversion.h>
 #include "affs.h"
 
 static int affs_readdir(struct file *, struct dir_context *);
@@ -80,7 +81,7 @@ affs_readdir(struct file *file, struct dir_context *ctx)
         * we can jump directly to where we left off.
         */
        ino = (u32)(long)file->private_data;
-       if (ino && file->f_version == inode->i_version) {
+       if (ino && inode_cmp_iversion(inode, file->f_version) == 0) {
                pr_debug("readdir() left off=%d\n", ino);
                goto inside;
        }
@@ -130,7 +131,7 @@ inside:
                } while (ino);
        }
 done:
-       file->f_version = inode->i_version;
+       file->f_version = inode_query_iversion(inode);
        file->private_data = (void *)(long)ino;
        affs_brelse(fh_bh);
 

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 1117e36134cc82e5127de496240f6f99b541b0a4..e602619aed9de905ae6d1fcfb7a02a911dff0f5f 100644 (file)
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -21,6 +21,7 @@
 #include <linux/writeback.h>
 #include <linux/blkdev.h>
 #include <linux/seq_file.h>
+#include <linux/iversion.h>
 #include "affs.h"
 
 static int affs_statfs(struct dentry *dentry, struct kstatfs *buf);
@@ -102,7 +103,7 @@ static struct inode *affs_alloc_inode(struct super_block *sb)
        if (!i)
                return NULL;
 
-       i->vfs_inode.i_version = 1;
+       inode_set_iversion(&i->vfs_inode, 1);
        i->i_lc = NULL;
        i->i_ext_bh = NULL;
        i->i_pa_cnt = 0;