From: Jan Kara <jack@suse.cz>
To: Jeff Layton <jlayton@kernel.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
hch@lst.de, neilb@suse.de, bfields@fieldses.org,
amir73il@gmail.com, jack@suse.de, viro@zeniv.linux.org.uk
Subject: Re: [PATCH 12/19] ocfs2: convert to new i_version API
Date: Mon, 18 Dec 2017 13:49:00 +0100 [thread overview]
Message-ID: <20171218124900.GB30350@quack2.suse.cz> (raw)
In-Reply-To: <20171213142017.23653-13-jlayton@kernel.org>
On Wed 13-12-17 09:20:10, Jeff Layton wrote:
> From: Jeff Layton <jlayton@redhat.com>
>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ocfs2/dir.c | 14 +++++++-------
> fs/ocfs2/inode.c | 2 +-
> fs/ocfs2/namei.c | 2 +-
> fs/ocfs2/quota_global.c | 2 +-
> 4 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
> index febe6312ceff..fe2c430a7809 100644
> --- a/fs/ocfs2/dir.c
> +++ b/fs/ocfs2/dir.c
> @@ -1174,7 +1174,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 +1729,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 +1775,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 +1791,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 +1869,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 +1886,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 +1940,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..71ce64665a18 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -302,7 +302,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..c045826b716a 100644
> --- a/fs/ocfs2/namei.c
> +++ b/fs/ocfs2/namei.c
> @@ -1520,7 +1520,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..e7595a63da43 100644
> --- a/fs/ocfs2/quota_global.c
> +++ b/fs/ocfs2/quota_global.c
> @@ -289,7 +289,7 @@ ssize_t ocfs2_quota_write(struct super_block *sb, int type,
> mlog_errno(err);
> return err;
> }
> - gqinode->i_version++;
> + inode_query_iversion(gqinode);
> ocfs2_mark_inode_dirty(handle, gqinode, oinfo->dqi_gqi_bh);
> return len;
> }
> --
> 2.14.3
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2017-12-18 12:49 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 14:19 [PATCH 00/19] fs: rework and optimize i_version handling in filesystems Jeff Layton
2017-12-13 14:19 ` [PATCH 01/19] fs: new API for handling inode->i_version Jeff Layton
2017-12-13 22:04 ` NeilBrown
2017-12-14 0:27 ` Jeff Layton
2017-12-16 4:17 ` NeilBrown
2017-12-17 13:01 ` Jeff Layton
2017-12-18 14:03 ` Jeff Layton
2017-12-13 14:20 ` [PATCH 02/19] fs: don't take the i_lock in inode_inc_iversion Jeff Layton
2017-12-13 21:52 ` Jeff Layton
2017-12-13 22:07 ` NeilBrown
2017-12-13 14:20 ` [PATCH 03/19] fat: convert to new i_version API Jeff Layton
2017-12-13 14:20 ` [PATCH 04/19] affs: " Jeff Layton
2017-12-13 14:20 ` [PATCH 05/19] afs: " Jeff Layton
2017-12-13 14:20 ` [PATCH 06/19] btrfs: " Jeff Layton
2017-12-13 14:20 ` [PATCH 07/19] exofs: switch " Jeff Layton
2017-12-13 14:20 ` [PATCH 08/19] ext2: convert " Jeff Layton
2017-12-18 12:47 ` Jan Kara
2017-12-13 14:20 ` [PATCH 09/19] ext4: " Jeff Layton
2017-12-14 21:52 ` Theodore Ts'o
2017-12-13 14:20 ` [PATCH 10/19] nfs: " Jeff Layton
2017-12-13 14:20 ` [PATCH 11/19] nfsd: " Jeff Layton
2017-12-13 14:20 ` [PATCH 12/19] ocfs2: " Jeff Layton
2017-12-18 12:49 ` Jan Kara [this message]
2017-12-13 14:20 ` [PATCH 13/19] ufs: use " Jeff Layton
2017-12-13 14:20 ` [PATCH 14/19] xfs: convert to " Jeff Layton
2017-12-13 22:48 ` Dave Chinner
2017-12-13 23:25 ` Dave Chinner
2017-12-14 0:10 ` Jeff Layton
2017-12-14 2:17 ` Dave Chinner
2017-12-14 11:16 ` Jeff Layton
2017-12-13 14:20 ` [PATCH 15/19] IMA: switch IMA over " Jeff Layton
2017-12-13 14:20 ` [PATCH 16/19] fs: only set S_VERSION when updating times if necessary Jeff Layton
2017-12-15 12:59 ` Jeff Layton
2017-12-13 14:20 ` [PATCH 17/19] xfs: avoid setting XFS_ILOG_CORE if i_version doesn't need incrementing Jeff Layton
2017-12-13 14:20 ` [PATCH 18/19] btrfs: only dirty the inode in btrfs_update_time if something was changed Jeff Layton
2017-12-15 13:03 ` Jeff Layton
2017-12-13 14:20 ` [PATCH 19/19] fs: handle inode->i_version more efficiently Jeff Layton
2017-12-13 15:05 ` [PATCH 00/19] fs: rework and optimize i_version handling in filesystems J. Bruce Fields
2017-12-13 20:14 ` Jeff Layton
2017-12-13 22:10 ` Jeff Layton
2017-12-13 23:03 ` Dave Chinner
2017-12-14 0:02 ` Jeff Layton
2017-12-14 14:14 ` Jeff Layton
2017-12-14 15:14 ` J. Bruce Fields
2017-12-15 15:15 ` Jeff Layton
2017-12-15 15:26 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171218124900.GB30350@quack2.suse.cz \
--to=jack@suse.cz \
--cc=amir73il@gmail.com \
--cc=bfields@fieldses.org \
--cc=hch@lst.de \
--cc=jack@suse.de \
--cc=jlayton@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=neilb@suse.de \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).