* [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields
@ 2016-12-20 15:55 Jeff Layton
2017-01-04 15:43 ` Jan Kara
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Layton @ 2016-12-20 15:55 UTC (permalink / raw)
To: tytso, adilger.kernel; +Cc: linux-ext4, linux-kernel
For some odd reason, it forces a byte-by-byte copy of each field. A
plain old swap() on most of these fields would be more efficient. We
do need to retain one memswap however as that field is an array.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/ext4/ioctl.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 49fd1371bfa2..fb844da4836f 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -60,18 +60,16 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
ei1 = EXT4_I(inode1);
ei2 = EXT4_I(inode2);
- memswap(&inode1->i_flags, &inode2->i_flags, sizeof(inode1->i_flags));
- memswap(&inode1->i_version, &inode2->i_version,
- sizeof(inode1->i_version));
- memswap(&inode1->i_blocks, &inode2->i_blocks,
- sizeof(inode1->i_blocks));
- memswap(&inode1->i_bytes, &inode2->i_bytes, sizeof(inode1->i_bytes));
- memswap(&inode1->i_atime, &inode2->i_atime, sizeof(inode1->i_atime));
- memswap(&inode1->i_mtime, &inode2->i_mtime, sizeof(inode1->i_mtime));
+ swap(inode1->i_flags, inode2->i_flags);
+ swap(inode1->i_version, inode2->i_version);
+ swap(inode1->i_blocks, inode2->i_blocks);
+ swap(inode1->i_bytes, inode2->i_bytes);
+ swap(inode1->i_atime, inode2->i_atime);
+ swap(inode1->i_mtime, inode2->i_mtime);
memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
- memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));
- memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));
+ swap(ei1->i_flags, ei2->i_flags);
+ swap(ei1->i_disksize, ei2->i_disksize);
ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);
ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields
2016-12-20 15:55 [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields Jeff Layton
@ 2017-01-04 15:43 ` Jan Kara
2017-01-04 20:21 ` Jeff Layton
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kara @ 2017-01-04 15:43 UTC (permalink / raw)
To: Jeff Layton; +Cc: tytso, adilger.kernel, linux-ext4, linux-kernel
On Tue 20-12-16 10:55:41, Jeff Layton wrote:
> For some odd reason, it forces a byte-by-byte copy of each field. A
> plain old swap() on most of these fields would be more efficient. We
> do need to retain one memswap however as that field is an array.
>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/ioctl.c | 18 ++++++++----------
> 1 file changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> index 49fd1371bfa2..fb844da4836f 100644
> --- a/fs/ext4/ioctl.c
> +++ b/fs/ext4/ioctl.c
> @@ -60,18 +60,16 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
> ei1 = EXT4_I(inode1);
> ei2 = EXT4_I(inode2);
>
> - memswap(&inode1->i_flags, &inode2->i_flags, sizeof(inode1->i_flags));
> - memswap(&inode1->i_version, &inode2->i_version,
> - sizeof(inode1->i_version));
> - memswap(&inode1->i_blocks, &inode2->i_blocks,
> - sizeof(inode1->i_blocks));
> - memswap(&inode1->i_bytes, &inode2->i_bytes, sizeof(inode1->i_bytes));
> - memswap(&inode1->i_atime, &inode2->i_atime, sizeof(inode1->i_atime));
> - memswap(&inode1->i_mtime, &inode2->i_mtime, sizeof(inode1->i_mtime));
> + swap(inode1->i_flags, inode2->i_flags);
> + swap(inode1->i_version, inode2->i_version);
> + swap(inode1->i_blocks, inode2->i_blocks);
> + swap(inode1->i_bytes, inode2->i_bytes);
> + swap(inode1->i_atime, inode2->i_atime);
> + swap(inode1->i_mtime, inode2->i_mtime);
>
> memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
> - memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));
> - memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));
> + swap(ei1->i_flags, ei2->i_flags);
> + swap(ei1->i_disksize, ei2->i_disksize);
> ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);
> ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);
>
> --
> 2.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields
2017-01-04 15:43 ` Jan Kara
@ 2017-01-04 20:21 ` Jeff Layton
2017-01-05 7:24 ` Jan Kara
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Layton @ 2017-01-04 20:21 UTC (permalink / raw)
To: Jan Kara; +Cc: tytso, adilger.kernel, linux-ext4, linux-kernel
On Wed, 2017-01-04 at 16:43 +0100, Jan Kara wrote:
> On Tue 20-12-16 10:55:41, Jeff Layton wrote:
> >
> > For some odd reason, it forces a byte-by-byte copy of each field. A
> > plain old swap() on most of these fields would be more efficient. We
> > do need to retain one memswap however as that field is an array.
> >
> > Signed-off-by: Jeff Layton <jlayton@redhat.com>
>
> Looks good to me. You can add:
>
> Reviewed-by: Jan Kara <jack@suse.cz>
>
> Honza
>
Thanks. Yeah, it's certainly nothing critical -- just something I
noticed while looking at the i_version rework. Seems like it might be
good to let soak in next for v4.11?
> >
> > ---
> > fs/ext4/ioctl.c | 18 ++++++++----------
> > 1 file changed, 8 insertions(+), 10 deletions(-)
> >
> > diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> > index 49fd1371bfa2..fb844da4836f 100644
> > --- a/fs/ext4/ioctl.c
> > +++ b/fs/ext4/ioctl.c
> > @@ -60,18 +60,16 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
> > ei1 = EXT4_I(inode1);
> > ei2 = EXT4_I(inode2);
> >
> > - memswap(&inode1->i_flags, &inode2->i_flags, sizeof(inode1->i_flags));
> > - memswap(&inode1->i_version, &inode2->i_version,
> > - sizeof(inode1->i_version));
> > - memswap(&inode1->i_blocks, &inode2->i_blocks,
> > - sizeof(inode1->i_blocks));
> > - memswap(&inode1->i_bytes, &inode2->i_bytes, sizeof(inode1->i_bytes));
> > - memswap(&inode1->i_atime, &inode2->i_atime, sizeof(inode1->i_atime));
> > - memswap(&inode1->i_mtime, &inode2->i_mtime, sizeof(inode1->i_mtime));
> > + swap(inode1->i_flags, inode2->i_flags);
> > + swap(inode1->i_version, inode2->i_version);
> > + swap(inode1->i_blocks, inode2->i_blocks);
> > + swap(inode1->i_bytes, inode2->i_bytes);
> > + swap(inode1->i_atime, inode2->i_atime);
> > + swap(inode1->i_mtime, inode2->i_mtime);
> >
> > memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
> > - memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));
> > - memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));
> > + swap(ei1->i_flags, ei2->i_flags);
> > + swap(ei1->i_disksize, ei2->i_disksize);
> > ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);
> > ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);
> >
> > --
> > 2.7.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jeff Layton <jlayton@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields
2017-01-04 20:21 ` Jeff Layton
@ 2017-01-05 7:24 ` Jan Kara
0 siblings, 0 replies; 4+ messages in thread
From: Jan Kara @ 2017-01-05 7:24 UTC (permalink / raw)
To: Jeff Layton; +Cc: Jan Kara, tytso, adilger.kernel, linux-ext4, linux-kernel
On Wed 04-01-17 15:21:28, Jeff Layton wrote:
> On Wed, 2017-01-04 at 16:43 +0100, Jan Kara wrote:
> > On Tue 20-12-16 10:55:41, Jeff Layton wrote:
> > >
> > > For some odd reason, it forces a byte-by-byte copy of each field. A
> > > plain old swap() on most of these fields would be more efficient. We
> > > do need to retain one memswap however as that field is an array.
> > >
> > > Signed-off-by: Jeff Layton <jlayton@redhat.com>
> >
> > Looks good to me. You can add:
> >
> > Reviewed-by: Jan Kara <jack@suse.cz>
> >
> > Honza
> >
>
> Thanks. Yeah, it's certainly nothing critical -- just something I
> noticed while looking at the i_version rework. Seems like it might be
> good to let soak in next for v4.11?
Yeah, it is definitely 4.11 material. I believe he'll pick up the patch to
his tree once he starts accumulating patches for the next merge window.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-05 7:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-20 15:55 [RFC PATCH] ext4: convert swap_inode_data() over to use swap() on most of the fields Jeff Layton
2017-01-04 15:43 ` Jan Kara
2017-01-04 20:21 ` Jeff Layton
2017-01-05 7:24 ` Jan Kara
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).