diff options
author | Christoph Hellwig <hch@lst.de> | 2017-05-10 15:06:33 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2017-06-05 16:59:12 +0200 |
commit | 85787090a21eb749d8b347eaf9ff1a455637473c (patch) | |
tree | 25f85517eb05e430352aff20e571fb604ec6abd1 /fs/ocfs2/super.c | |
parent | 787d8c530af73257240fc0c0f60e296a83d5e5f4 (diff) | |
download | linux-stable-85787090a21eb749d8b347eaf9ff1a455637473c.tar.gz linux-stable-85787090a21eb749d8b347eaf9ff1a455637473c.tar.bz2 linux-stable-85787090a21eb749d8b347eaf9ff1a455637473c.zip |
fs: switch ->s_uuid to uuid_t
For some file systems we still memcpy into it, but in various places this
already allows us to use the proper uuid helpers. More to come..
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> (Changes to IMA/EVM)
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'fs/ocfs2/super.c')
-rw-r--r-- | fs/ocfs2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index ca1646fbcaef..83005f486451 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -2062,7 +2062,7 @@ static int ocfs2_initialize_super(struct super_block *sb, cbits = le32_to_cpu(di->id2.i_super.s_clustersize_bits); bbits = le32_to_cpu(di->id2.i_super.s_blocksize_bits); sb->s_maxbytes = ocfs2_max_file_offset(bbits, cbits); - memcpy(sb->s_uuid, di->id2.i_super.s_uuid, + memcpy(&sb->s_uuid, di->id2.i_super.s_uuid, sizeof(di->id2.i_super.s_uuid)); osb->osb_dx_mask = (1 << (cbits - bbits)) - 1; |