Skip to content

Commit

Permalink
Merge tag 'zonefs-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/dlemoal/zonefs

Pull zonefs update from Damien Le Moal:
 "Only one patch in this pull request to cleanup handling of uuid using
  the import_uuid() helper, from Andy"

* tag 'zonefs-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs:
  zonefs: Replace uuid_copy() with import_uuid()
  • Loading branch information
torvalds committed Jun 4, 2020
2 parents 9fb4c52 + 568776f commit d77d1db
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/zonefs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@ static int zonefs_read_super(struct super_block *sb)
goto unmap;
}

uuid_copy(&sbi->s_uuid, (uuid_t *)super->s_uuid);
import_uuid(&sbi->s_uuid, super->s_uuid);
ret = 0;

unmap:
Expand Down

0 comments on commit d77d1db

Please sign in to comment.