diff options
author | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2017-06-13 11:45:14 +0200 |
commit | fdd050b5b3c96813ae6756ed68157d32ba31b9f2 (patch) | |
tree | ca1a216730e32471cd17886d9de1902228bc340c /fs/gfs2/ops_fstype.c | |
parent | f06345add95f388519e83ec398134853e0f64ac9 (diff) | |
parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) |
Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base
Diffstat (limited to 'fs/gfs2/ops_fstype.c')
-rw-r--r-- | fs/gfs2/ops_fstype.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 83953cdbbc6c..e76058d34b74 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -203,7 +203,7 @@ static void gfs2_sb_in(struct gfs2_sbd *sdp, const void *buf) memcpy(sb->sb_lockproto, str->sb_lockproto, GFS2_LOCKNAME_LEN); memcpy(sb->sb_locktable, str->sb_locktable, GFS2_LOCKNAME_LEN); - memcpy(s->s_uuid, str->sb_uuid, 16); + memcpy(&s->s_uuid, str->sb_uuid, 16); } /** |