Merge tag 'zonefs-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs

torvalds · torvalds · commit d77d1dbba955 · 2020-06-04T13:50:13.000-07:00
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()
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -1330,7 +1330,7 @@ static int zonefs_read_super(struct super_block *sb)`
`1330`	`1330`	`goto unmap;`
`1331`	`1331`	`}`
`1332`	`1332`
`1333`		`- uuid_copy(&sbi->s_uuid, (uuid_t *)super->s_uuid);`
	`1333`	`+ import_uuid(&sbi->s_uuid, super->s_uuid);`
`1334`	`1334`	`ret = 0;`
`1335`	`1335`
`1336`	`1336`	`unmap:`