Commit bf476433 authored by Christoph Hellwig's avatar Christoph Hellwig

scsi_debug: switch to uuid_t

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 8e412263
...@@ -245,7 +245,7 @@ struct sdebug_dev_info { ...@@ -245,7 +245,7 @@ struct sdebug_dev_info {
unsigned int channel; unsigned int channel;
unsigned int target; unsigned int target;
u64 lun; u64 lun;
uuid_be lu_name; uuid_t lu_name;
struct sdebug_host_info *sdbg_host; struct sdebug_host_info *sdbg_host;
unsigned long uas_bm[1]; unsigned long uas_bm[1];
atomic_t num_in_q; atomic_t num_in_q;
...@@ -965,7 +965,7 @@ static const u64 naa3_comp_c = 0x3111111000000000ULL; ...@@ -965,7 +965,7 @@ static const u64 naa3_comp_c = 0x3111111000000000ULL;
static int inquiry_vpd_83(unsigned char *arr, int port_group_id, static int inquiry_vpd_83(unsigned char *arr, int port_group_id,
int target_dev_id, int dev_id_num, int target_dev_id, int dev_id_num,
const char *dev_id_str, int dev_id_str_len, const char *dev_id_str, int dev_id_str_len,
const uuid_be *lu_name) const uuid_t *lu_name)
{ {
int num, port_a; int num, port_a;
char b[32]; char b[32];
...@@ -3568,7 +3568,7 @@ static void sdebug_q_cmd_wq_complete(struct work_struct *work) ...@@ -3568,7 +3568,7 @@ static void sdebug_q_cmd_wq_complete(struct work_struct *work)
} }
static bool got_shared_uuid; static bool got_shared_uuid;
static uuid_be shared_uuid; static uuid_t shared_uuid;
static struct sdebug_dev_info *sdebug_device_create( static struct sdebug_dev_info *sdebug_device_create(
struct sdebug_host_info *sdbg_host, gfp_t flags) struct sdebug_host_info *sdbg_host, gfp_t flags)
...@@ -3578,12 +3578,12 @@ static struct sdebug_dev_info *sdebug_device_create( ...@@ -3578,12 +3578,12 @@ static struct sdebug_dev_info *sdebug_device_create(
devip = kzalloc(sizeof(*devip), flags); devip = kzalloc(sizeof(*devip), flags);
if (devip) { if (devip) {
if (sdebug_uuid_ctl == 1) if (sdebug_uuid_ctl == 1)
uuid_be_gen(&devip->lu_name); uuid_gen(&devip->lu_name);
else if (sdebug_uuid_ctl == 2) { else if (sdebug_uuid_ctl == 2) {
if (got_shared_uuid) if (got_shared_uuid)
devip->lu_name = shared_uuid; devip->lu_name = shared_uuid;
else { else {
uuid_be_gen(&shared_uuid); uuid_gen(&shared_uuid);
got_shared_uuid = true; got_shared_uuid = true;
devip->lu_name = shared_uuid; devip->lu_name = shared_uuid;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment