lkml.org 
[lkml]   [2017]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/16] xfs: use uuid_copy() helper to abstract uuid_t
    Date
    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>
    ---
    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
    \
     
     \ /
      Last update: 2017-05-10 21:22    [W:4.045 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site