summaryrefslogtreecommitdiff
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-06-13 12:45:14 +0300
committerChristoph Hellwig <hch@lst.de>2017-06-13 12:45:14 +0300
commitfdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch)
treeca1a216730e32471cd17886d9de1902228bc340c /fs/ocfs2
parentf06345add95f388519e83ec398134853e0f64ac9 (diff)
parent87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff)
downloadlinux-fdd050b5b3c96813ae6756ed68157d32ba31b9f2.tar.xz
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/super.c2
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;