From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Jeff Layton <jlayton@kernel.org>
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org,
bfields@fieldses.org, neilb@suse.de, jack@suse.de,
linux-ext4@vger.kernel.org, tytso@mit.edu,
adilger.kernel@dilger.ca, linux-xfs@vger.kernel.org,
david@fromorbit.com, linux-btrfs@vger.kernel.org, clm@fb.com,
jbacik@fb.com, dsterba@suse.com, linux-integrity@vger.kernel.org,
zohar@linux.vnet.ibm.com, dmitry.kasatkin@gmail.com,
linux-afs@lists.infradead.org, dhowells@redhat.com,
jaltman@auristor.com
Subject: Re: [PATCH v4 14/19] xfs: convert to new i_version API
Date: Fri, 22 Dec 2017 16:05:14 -0800 [thread overview]
Message-ID: <20171223000514.GE12613@magnolia> (raw)
In-Reply-To: <20171222120556.7435-15-jlayton@kernel.org>
On Fri, Dec 22, 2017 at 07:05:51AM -0500, Jeff Layton wrote:
> From: Jeff Layton <jlayton@redhat.com>
>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 7 +++++--
> fs/xfs/xfs_icache.c | 5 +++--
> fs/xfs/xfs_inode.c | 3 ++-
> fs/xfs/xfs_inode_item.c | 3 ++-
> fs/xfs/xfs_trans_inode.c | 4 +++-
> 5 files changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 6b7989038d75..b9c0bf80669c 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -32,6 +32,8 @@
> #include "xfs_ialloc.h"
> #include "xfs_dir2.h"
>
> +#include <linux/iversion.h>
/me wonders if these ought to be in fs/xfs/xfs_linux.h since this is
libxfs, but seeing as I already let that horse escape I might as well
clean it up separately.
Looks ok,
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> +
> /*
> * Check that none of the inode's in the buffer have a next
> * unlinked field of 0.
> @@ -264,7 +266,8 @@ xfs_inode_from_disk(
> to->di_flags = be16_to_cpu(from->di_flags);
>
> if (to->di_version == 3) {
> - inode->i_version = be64_to_cpu(from->di_changecount);
> + inode_set_iversion_queried(inode,
> + be64_to_cpu(from->di_changecount));
> to->di_crtime.t_sec = be32_to_cpu(from->di_crtime.t_sec);
> to->di_crtime.t_nsec = be32_to_cpu(from->di_crtime.t_nsec);
> to->di_flags2 = be64_to_cpu(from->di_flags2);
> @@ -314,7 +317,7 @@ xfs_inode_to_disk(
> to->di_flags = cpu_to_be16(from->di_flags);
>
> if (from->di_version == 3) {
> - to->di_changecount = cpu_to_be64(inode->i_version);
> + to->di_changecount = cpu_to_be64(inode_peek_iversion(inode));
> to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec);
> to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec);
> to->di_flags2 = cpu_to_be64(from->di_flags2);
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 43005fbe8b1e..4c315adb05e6 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -37,6 +37,7 @@
>
> #include <linux/kthread.h>
> #include <linux/freezer.h>
> +#include <linux/iversion.h>
>
> /*
> * Allocate and initialise an xfs_inode.
> @@ -293,14 +294,14 @@ xfs_reinit_inode(
> int error;
> uint32_t nlink = inode->i_nlink;
> uint32_t generation = inode->i_generation;
> - uint64_t version = inode->i_version;
> + uint64_t version = inode_peek_iversion(inode);
> umode_t mode = inode->i_mode;
>
> error = inode_init_always(mp->m_super, inode);
>
> set_nlink(inode, nlink);
> inode->i_generation = generation;
> - inode->i_version = version;
> + inode_set_iversion_queried(inode, version);
> inode->i_mode = mode;
> return error;
> }
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 801274126648..dfc5e60d8af3 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -16,6 +16,7 @@
> * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> */
> #include <linux/log2.h>
> +#include <linux/iversion.h>
>
> #include "xfs.h"
> #include "xfs_fs.h"
> @@ -833,7 +834,7 @@ xfs_ialloc(
> ip->i_d.di_flags = 0;
>
> if (ip->i_d.di_version == 3) {
> - inode->i_version = 1;
> + inode_set_iversion(inode, 1);
> ip->i_d.di_flags2 = 0;
> ip->i_d.di_cowextsize = 0;
> ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index 6ee5c3bf19ad..7571abf5dfb3 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -30,6 +30,7 @@
> #include "xfs_buf_item.h"
> #include "xfs_log.h"
>
> +#include <linux/iversion.h>
>
> kmem_zone_t *xfs_ili_zone; /* inode log item zone */
>
> @@ -354,7 +355,7 @@ xfs_inode_to_log_dinode(
> to->di_next_unlinked = NULLAGINO;
>
> if (from->di_version == 3) {
> - to->di_changecount = inode->i_version;
> + to->di_changecount = inode_peek_iversion(inode);
> to->di_crtime.t_sec = from->di_crtime.t_sec;
> to->di_crtime.t_nsec = from->di_crtime.t_nsec;
> to->di_flags2 = from->di_flags2;
> diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c
> index daa7615497f9..225544327c4f 100644
> --- a/fs/xfs/xfs_trans_inode.c
> +++ b/fs/xfs/xfs_trans_inode.c
> @@ -28,6 +28,8 @@
> #include "xfs_inode_item.h"
> #include "xfs_trace.h"
>
> +#include <linux/iversion.h>
> +
> /*
> * Add a locked inode to the transaction.
> *
> @@ -117,7 +119,7 @@ xfs_trans_log_inode(
> */
> if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) &&
> IS_I_VERSION(VFS_I(ip))) {
> - VFS_I(ip)->i_version++;
> + inode_inc_iversion(VFS_I(ip));
> flags |= XFS_ILOG_CORE;
> }
>
> --
> 2.14.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-12-23 0:16 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 12:05 [PATCH v4 00/19] fs: rework and optimize i_version handling in filesystems Jeff Layton
2017-12-22 12:05 ` [PATCH v4 01/19] fs: new API for handling inode->i_version Jeff Layton
2017-12-22 23:14 ` NeilBrown
2017-12-22 23:54 ` Jeff Layton
2018-01-02 17:01 ` Jan Kara
2017-12-25 14:50 ` Jeff Layton
2017-12-22 12:05 ` [PATCH v4 02/19] fs: don't take the i_lock in inode_inc_iversion Jeff Layton
2017-12-22 12:05 ` [PATCH v4 03/19] fat: convert to new i_version API Jeff Layton
2017-12-22 12:05 ` [PATCH v4 04/19] affs: " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 05/19] afs: " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 06/19] btrfs: " Jeff Layton
2018-01-08 17:59 ` David Sterba
2017-12-22 12:05 ` [PATCH v4 07/19] exofs: switch " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 08/19] ext2: convert " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 09/19] ext4: " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 10/19] nfs: " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 11/19] nfsd: " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 12/19] ocfs2: " Jeff Layton
2018-01-04 13:34 ` Jeff Layton
2017-12-22 12:05 ` [PATCH v4 13/19] ufs: use " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 14/19] xfs: convert to " Jeff Layton
2017-12-23 0:05 ` Darrick J. Wong [this message]
2017-12-22 12:05 ` [PATCH v4 15/19] IMA: switch IMA over " Jeff Layton
2017-12-22 12:05 ` [PATCH v4 16/19] fs: only set S_VERSION when updating times if necessary Jeff Layton
2018-01-02 16:50 ` Jan Kara
2018-01-02 19:03 ` Jeff Layton
2017-12-22 12:05 ` [PATCH v4 17/19] xfs: avoid setting XFS_ILOG_CORE if i_version doesn't need incrementing Jeff Layton
2017-12-23 0:07 ` Darrick J. Wong
2017-12-22 12:05 ` [PATCH v4 18/19] btrfs: only dirty the inode in btrfs_update_time if something was changed Jeff Layton
2018-01-08 17:59 ` David Sterba
2017-12-22 12:05 ` [PATCH v4 19/19] fs: handle inode->i_version more efficiently Jeff Layton
2018-01-02 17:00 ` Jan Kara
2018-01-07 12:44 ` Krzysztof Kozlowski
2018-01-08 12:56 ` Jeff Layton
2018-01-08 13:21 ` Krzysztof Kozlowski
2018-01-08 13:29 ` Jeff Layton
2018-01-08 17:29 ` Krzysztof Kozlowski
2018-01-08 18:00 ` Jeff Layton
2018-01-08 18:33 ` Krzysztof Kozlowski
2018-01-08 19:15 ` Jeff Layton
2018-01-08 20:05 ` Jeff Layton
2018-01-08 20:17 ` Krzysztof Kozlowski
2018-01-08 21:39 ` Jeff Layton
2018-01-09 9:27 ` Krzysztof Kozlowski
2018-01-08 13:30 ` Matthew Wilcox
2018-01-08 13:46 ` Jeff Layton
2017-12-22 14:43 ` (Lack of) i_version handling in udf Steve Magnani
2017-12-22 15:54 ` Jeff Layton
2018-01-02 17:20 ` [PATCH v4 05/19] afs: convert to new i_version API David Howells
2018-01-02 18:57 ` Jeff Layton
2018-01-03 16:28 ` David Howells
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=20171223000514.GE12613@magnolia \
--to=darrick.wong@oracle.com \
--cc=adilger.kernel@dilger.ca \
--cc=bfields@fieldses.org \
--cc=clm@fb.com \
--cc=david@fromorbit.com \
--cc=dhowells@redhat.com \
--cc=dmitry.kasatkin@gmail.com \
--cc=dsterba@suse.com \
--cc=jack@suse.de \
--cc=jaltman@auristor.com \
--cc=jbacik@fb.com \
--cc=jlayton@kernel.org \
--cc=linux-afs@lists.infradead.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=zohar@linux.vnet.ibm.com \
/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).