convert-swap_inode_data-over-to-use-swap-on-most-fields

   1 ext4: convert swap_inode_data() over to use swap() on most of the fields
   2
   3 From: Jeff Layton <jlayton@redhat.com>
   4
   5 For some odd reason, it forces a byte-by-byte copy of each field. A
   6 plain old swap() on most of these fields would be more efficient. We
   7 do need to retain the memswap of i_data however as that field is an array.
   8
   9 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
  10 Signed-off-by: Jeff Layton <jlayton@redhat.com>
  11 Reviewed-by: Jan Kara <jack@suse.cz>
  12 ---
  13  fs/ext4/ioctl.c | 18 ++++++++----------
  14  1 file changed, 8 insertions(+), 10 deletions(-)
  15
  16 diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
  17 index 0c21e22acd74..3f76a9004e43 100644
  18 --- a/fs/ext4/ioctl.c
  19 +++ b/fs/ext4/ioctl.c
  20 @@ -64,18 +64,16 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2)
  21         ei1 = EXT4_I(inode1);
  22         ei2 = EXT4_I(inode2);
  23
  24 -       memswap(&inode1->i_flags, &inode2->i_flags, sizeof(inode1->i_flags));
  25 -       memswap(&inode1->i_version, &inode2->i_version,
  26 -                 sizeof(inode1->i_version));
  27 -       memswap(&inode1->i_blocks, &inode2->i_blocks,
  28 -                 sizeof(inode1->i_blocks));
  29 -       memswap(&inode1->i_bytes, &inode2->i_bytes, sizeof(inode1->i_bytes));
  30 -       memswap(&inode1->i_atime, &inode2->i_atime, sizeof(inode1->i_atime));
  31 -       memswap(&inode1->i_mtime, &inode2->i_mtime, sizeof(inode1->i_mtime));
  32 +       swap(inode1->i_flags, inode2->i_flags);
  33 +       swap(inode1->i_version, inode2->i_version);
  34 +       swap(inode1->i_blocks, inode2->i_blocks);
  35 +       swap(inode1->i_bytes, inode2->i_bytes);
  36 +       swap(inode1->i_atime, inode2->i_atime);
  37 +       swap(inode1->i_mtime, inode2->i_mtime);
  38
  39         memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));
  40 -       memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));
  41 -       memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));
  42 +       swap(ei1->i_flags, ei2->i_flags);
  43 +       swap(ei1->i_disksize, ei2->i_disksize);
  44         ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);
  45         ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);
  46
  47 --
  48 2.13.0
  49
  50