Re: [PATCH v4 12/19] ocfs2: convert to new i_version API

Jeff Layton
2018-01-04T13:34:40Z

On Fri, 2017-12-22 at 07:05 -0500, Jeff Layton wrote:
> From: Jeff Layton <jlayton@redhat.com>
>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> Reviewed-by: Jan Kara <jack@suse.cz>
> ---
> fs/ocfs2/dir.c | 15 ++++++++-------
> fs/ocfs2/inode.c | 3 ++-
> fs/ocfs2/namei.c | 3 ++-
> fs/ocfs2/quota_global.c | 3 ++-
> 4 files changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index febe6312ceff..32f9c72dff17 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -42,6 +42,7 @@
> #include <linux/highmem.h>
> #include <linux/quotaops.h>
> #include <linux/sort.h>
> +#include <linux/iversion.h>
>
> #include <cluster/masklog.h>
>
> @@ -1174,7 +1175,7 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
> le16_add_cpu(&pde->rec_len,
> le16_to_cpu(de->rec_len));
> de->inode = 0;
> - dir->i_version++;
> + inode_inc_iversion(dir);
> ocfs2_journal_dirty(handle, bh);
> goto bail;
> }
> @@ -1729,7 +1730,7 @@ int __ocfs2_add_entry(handle_t *handle,
> if (ocfs2_dir_indexed(dir))
> ocfs2_recalc_free_list(dir, handle, lookup);
>
> - dir->i_version++;
> + inode_inc_iversion(dir);
> ocfs2_journal_dirty(handle, insert_bh);
> retval = 0;
> goto bail;
> @@ -1775,7 +1776,7 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode,
> * readdir(2), then we might be pointing to an invalid
> * dirent right now. Scan from the start of the block
> * to make sure. */
> - if (*f_version != inode->i_version) {
> + if (inode_cmp_iversion(inode, *f_version)) {
> for (i = 0; i < i_size_read(inode) && i < offset; ) {
> de = (struct ocfs2_dir_entry *)
> (data->id_data + i);
> @@ -1791,7 +1792,7 @@ static int ocfs2_dir_foreach_blk_id(struct inode *inode,
> i += le16_to_cpu(de->rec_len);
> }
> ctx->pos = offset = i;
> - *f_version = inode->i_version;
> + *f_version = inode_query_iversion(inode);
> }
>
> de = (struct ocfs2_dir_entry *) (data->id_data + ctx->pos);
> @@ -1869,7 +1870,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,
> * readdir(2), then we might be pointing to an invalid
> * dirent right now. Scan from the start of the block
> * to make sure. */
> - if (*f_version != inode->i_version) {
> + if (inode_cmp_iversion(inode, *f_version)) {
> for (i = 0; i < sb->s_blocksize && i < offset; ) {
> de = (struct ocfs2_dir_entry *) (bh->b_data + i);
> /* It's too expensive to do a full
> @@ -1886,7 +1887,7 @@ static int ocfs2_dir_foreach_blk_el(struct inode *inode,
> offset = i;
> ctx->pos = (ctx->pos & ~(sb->s_blocksize - 1))
> | offset;
> - *f_version = inode->i_version;
> + *f_version = inode_query_iversion(inode);
> }
>
> while (ctx->pos < i_size_read(inode)
> @@ -1940,7 +1941,7 @@ static int ocfs2_dir_foreach_blk(struct inode *inode, u64 *f_version,
> */
> int ocfs2_dir_foreach(struct inode *inode, struct dir_context *ctx)
> {
> - u64 version = inode->i_version;
> + u64 version = inode_query_iversion(inode);
> ocfs2_dir_foreach_blk(inode, &version, ctx, true);
> return 0;
> }
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 1a1e0078ab38..d51b80edd972 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -28,6 +28,7 @@
> #include <linux/highmem.h>
> #include <linux/pagemap.h>
> #include <linux/quotaops.h>
> +#include <linux/iversion.h>
>
> #include <asm/byteorder.h>
>
> @@ -302,7 +303,7 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe,
> OCFS2_I(inode)->ip_attr = le32_to_cpu(fe->i_attr);
> OCFS2_I(inode)->ip_dyn_features = le16_to_cpu(fe->i_dyn_features);
>
> - inode->i_version = 1;
> + inode_set_iversion(inode, 1);
> inode->i_generation = le32_to_cpu(fe->i_generation);
> inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev));
> inode->i_mode = le16_to_cpu(fe->i_mode);
> diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
> index 3b0a10d9b36f..c801eddc4bf3 100644
> --- a/fs/ocfs2/namei.c
> +++ b/fs/ocfs2/namei.c
> @@ -41,6 +41,7 @@
> #include <linux/slab.h>
> #include <linux/highmem.h>
> #include <linux/quotaops.h>
> +#include <linux/iversion.h>
>
> #include <cluster/masklog.h>
>
> @@ -1520,7 +1521,7 @@ static int ocfs2_rename(struct inode *old_dir,
> mlog_errno(status);
> goto bail;
> }
> - new_dir->i_version++;
> + inode_inc_iversion(new_dir);
>
> if (S_ISDIR(new_inode->i_mode))
> ocfs2_set_links_count(newfe, 0);
> diff --git a/fs/ocfs2/quota_global.c b/fs/ocfs2/quota_global.c
> index b39d14cbfa34..d03411784aaf 100644
> --- a/fs/ocfs2/quota_global.c
> +++ b/fs/ocfs2/quota_global.c
> @@ -12,6 +12,7 @@
> #include <linux/writeback.h>
> #include <linux/workqueue.h>
> #include <linux/llist.h>
> +#include <linux/iversion.h>
>
> #include <cluster/masklog.h>
>
> @@ -289,7 +290,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
> mlog_errno(err);
> return err;
> }
> - gqinode->i_version++;
> + inode_query_iversion(gqinode);

Bug here: this should have been an inode_inc_iversion. Fixed in tree.

> ocfs2_mark_inode_dirty(handle, gqinode, oinfo->dqi_gqi_bh);
> return len;
> }

--
Jeff Layton <jlayton@kernel.org>