lkml.org 
[lkml]   [2017]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 04/19] affs: convert to new i_version API
    Date
    From: Jeff Layton <jlayton@redhat.com>

    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    ---
    fs/affs/amigaffs.c | 5 +++--
    fs/affs/dir.c | 5 +++--
    fs/affs/super.c | 3 ++-
    3 files changed, 8 insertions(+), 5 deletions(-)

    diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
    index 0f0e6925e97d..14a6c1b90c9f 100644
    --- 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 a105e77df2c1..d180b46453cf 100644
    --- 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 @@ affs_readdir(struct file *file, struct dir_context *ctx)
    } 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 1117e36134cc..e602619aed9d 100644
    --- 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;
    --
    2.14.3
    \
     
     \ /
      Last update: 2017-12-18 16:25    [W:2.936 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site