Merge branch 'uuid-types' of bombadil.infradead.org:public_git/uuid into nvme-base

This commit is contained in:
Christoph Hellwig 2017-06-13 11:45:14 +02:00
commit fdd050b5b3
76 changed files with 373 additions and 500 deletions

View file

@ -1937,7 +1937,7 @@ try_onemore:
sb->s_time_gran = 1;
sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
(test_opt(sbi, POSIX_ACL) ? MS_POSIXACL : 0);
memcpy(sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid));
memcpy(&sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid));
/* init f2fs-specific super block info */
sbi->valid_super_block = valid_super_block;