summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-04 13:50:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-04 13:50:13 -0700
commitd77d1dbba95500d1b38cab98bf608ad46dce8374 (patch)
tree898c0a702ae2661239e276af6ac388581e2c9586 /fs
parent9fb4c5250f10dc4d8257cd766991be690eb25c5b (diff)
parent568776f992c4cb5e1b5715dc4ab62e6ae906b80d (diff)
Merge tag 'zonefs-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/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()
Diffstat (limited to 'fs')
-rw-r--r--fs/zonefs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
index d79b821ed1c7..07bc42d62673 100644
--- a/fs/zonefs/super.c
+++ b/fs/zonefs/super.c
@@ -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: