提交 e64e17a5 编写于 作者: C Christoph Hellwig

S390/sysinfo: use uuid_is_null instead of opencoding it

And switch to use uuid_t instead of the old uuid_be type.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Reviewed-by: NAmir Goldstein <amir73il@gmail.com>
Reviewed-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
上级 ef40dda5
...@@ -109,7 +109,7 @@ struct sysinfo_2_2_2 { ...@@ -109,7 +109,7 @@ struct sysinfo_2_2_2 {
unsigned short cpus_shared; unsigned short cpus_shared;
char reserved_4[3]; char reserved_4[3];
unsigned char vsne; unsigned char vsne;
uuid_be uuid; uuid_t uuid;
char reserved_5[160]; char reserved_5[160];
char ext_name[256]; char ext_name[256];
}; };
...@@ -134,7 +134,7 @@ struct sysinfo_3_2_2 { ...@@ -134,7 +134,7 @@ struct sysinfo_3_2_2 {
char reserved_1[3]; char reserved_1[3];
unsigned char evmne; unsigned char evmne;
unsigned int reserved_2; unsigned int reserved_2;
uuid_be uuid; uuid_t uuid;
} vm[8]; } vm[8];
char reserved_3[1504]; char reserved_3[1504];
char ext_names[8][256]; char ext_names[8][256];
......
...@@ -242,7 +242,7 @@ static void print_ext_name(struct seq_file *m, int lvl, ...@@ -242,7 +242,7 @@ static void print_ext_name(struct seq_file *m, int lvl,
static void print_uuid(struct seq_file *m, int i, struct sysinfo_3_2_2 *info) static void print_uuid(struct seq_file *m, int i, struct sysinfo_3_2_2 *info)
{ {
if (!memcmp(&info->vm[i].uuid, &NULL_UUID_BE, sizeof(uuid_be))) if (uuid_is_null(&info->vm[i].uuid))
return; return;
seq_printf(m, "VM%02d UUID: %pUb\n", i, &info->vm[i].uuid); seq_printf(m, "VM%02d UUID: %pUb\n", i, &info->vm[i].uuid);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册