linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Amir Goldstein <amir73il@gmail.com>,
	linux-fsdevel@vger.kernel.org
Cc: Shaohua Li <shli@kernel.org>,
	Dan Williams <dan.j.williams@intel.com>,
	David Howells <dhowells@redhat.com>,
	Steven Whitehouse <swhiteho@redhat.com>,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	linux-xfs@vger.kernel.org, linux-raid@vger.kernel.org,
	linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org,
	linux-block@vger.kernel.org
Subject: [PATCH 02/22] xfs: use uuid_copy() helper to abstract uuid_t
Date: Sun, 28 May 2017 13:19:48 +0300	[thread overview]
Message-ID: <20170528102008.30276-3-hch@lst.de> (raw)
In-Reply-To: <20170528102008.30276-1-hch@lst.de>

From: Amir Goldstein <amir73il@gmail.com>

uuid_t definition is about to change.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/xfs_inode_item.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 08cb7d1a4a3a..013cc78d7daf 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -834,9 +834,7 @@ xfs_inode_item_format_convert(
 		in_f->ilf_dsize = in_f32->ilf_dsize;
 		in_f->ilf_ino = in_f32->ilf_ino;
 		/* copy biggest field of ilf_u */
-		memcpy(in_f->ilf_u.ilfu_uuid.__u_bits,
-		       in_f32->ilf_u.ilfu_uuid.__u_bits,
-		       sizeof(uuid_t));
+		uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f32->ilf_u.ilfu_uuid);
 		in_f->ilf_blkno = in_f32->ilf_blkno;
 		in_f->ilf_len = in_f32->ilf_len;
 		in_f->ilf_boffset = in_f32->ilf_boffset;
@@ -851,9 +849,7 @@ xfs_inode_item_format_convert(
 		in_f->ilf_dsize = in_f64->ilf_dsize;
 		in_f->ilf_ino = in_f64->ilf_ino;
 		/* copy biggest field of ilf_u */
-		memcpy(in_f->ilf_u.ilfu_uuid.__u_bits,
-		       in_f64->ilf_u.ilfu_uuid.__u_bits,
-		       sizeof(uuid_t));
+		uuid_copy(&in_f->ilf_u.ilfu_uuid, &in_f64->ilf_u.ilfu_uuid);
 		in_f->ilf_blkno = in_f64->ilf_blkno;
 		in_f->ilf_len = in_f64->ilf_len;
 		in_f->ilf_boffset = in_f64->ilf_boffset;
-- 
2.11.0


  parent reply	other threads:[~2017-05-28 10:20 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-28 10:19 cleanup UUID types V5 Christoph Hellwig
2017-05-28 10:19 ` [PATCH 01/22] Revert "afs: Move UUID struct to linux/uuid.h" Christoph Hellwig
2017-05-28 10:19 ` Christoph Hellwig [this message]
2017-05-28 10:19 ` [PATCH 03/22] xfs: use uuid_be to implement the uuid_t type Christoph Hellwig
2017-05-28 10:19 ` [PATCH 04/22] md: namespace private helper names Christoph Hellwig
2017-05-28 10:19 ` [PATCH 05/22] uuid: remove uuid_be defintions from the uapi header Christoph Hellwig
2017-05-28 10:19 ` [PATCH 06/22] uuid: rename uuid types Christoph Hellwig
2017-05-28 10:19 ` [PATCH 07/22] uuid: don't export guid_index and uuid_index Christoph Hellwig
2017-05-28 10:19 ` [PATCH 08/22] uuid: hoist helpers uuid_equal() and uuid_copy() from xfs Christoph Hellwig
2017-05-28 10:19 ` [PATCH 09/22] uuid: hoist uuid_is_null() helper from libnvdimm Christoph Hellwig
2017-05-28 10:19 ` [PATCH 10/22] S390/sysinfo: use uuid_is_null instead of opencoding it Christoph Hellwig
2017-05-28 10:19 ` [PATCH 11/22] xfs: remove uuid_getnodeuniq and xfs_uu_t Christoph Hellwig
2017-05-28 10:19 ` [PATCH 12/22] xfs: use the common helper uuid_is_null() Christoph Hellwig
2017-05-28 10:19 ` [PATCH 13/22] block: remove blk_part_pack_uuid Christoph Hellwig
2017-05-28 10:20 ` [PATCH 14/22] ima/policy: switch to use uuid_t Christoph Hellwig
2017-05-28 10:20 ` [PATCH 15/22] fs: switch ->s_uuid to uuid_t Christoph Hellwig
2017-05-28 10:20 ` [PATCH 16/22] overlayfs: use uuid_t instead of uuid_be Christoph Hellwig
2017-05-28 10:20 ` [PATCH 17/22] partitions/ldm: switch to use uuid_t Christoph Hellwig
2017-05-28 10:20 ` [PATCH 18/22] sysctl: " Christoph Hellwig
2017-05-28 10:20 ` [PATCH 19/22] nvme: switch to uuid_t Christoph Hellwig
2017-05-28 10:20 ` [PATCH 20/22] scsi_debug: " Christoph Hellwig
2017-05-28 10:20 ` [PATCH 21/22] tmpfs: generate random sb->s_uuid Christoph Hellwig
2017-05-28 10:20 ` [PATCH 22/22] MAINTAINERS: add uuid entry Christoph Hellwig
2017-05-30 10:00 ` [PATCH 01/22] Revert "afs: Move UUID struct to linux/uuid.h" David Howells
2017-05-31  9:41   ` Christoph Hellwig
2017-05-31 10:33   ` 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=20170528102008.30276-3-hch@lst.de \
    --to=hch@lst.de \
    --cc=amir73il@gmail.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dhowells@redhat.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=shli@kernel.org \
    --cc=swhiteho@redhat.com \
    --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).