Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Use __uXX types for S390 DASD volume label definitions which are user-visible

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

+19 -19
+19 -19
include/asm-s390/vtoc.h
··· 177 177 } __attribute__ ((packed)); 178 178 179 179 struct vtoc_cms_label { 180 - u8 label_id[4]; /* Label identifier */ 181 - u8 vol_id[6]; /* Volid */ 182 - u16 version_id; /* Version identifier */ 183 - u32 block_size; /* Disk block size */ 184 - u32 origin_ptr; /* Disk origin pointer */ 185 - u32 usable_count; /* Number of usable cylinders/blocks */ 186 - u32 formatted_count; /* Maximum number of formatted cylinders/ 180 + __u8 label_id[4]; /* Label identifier */ 181 + __u8 vol_id[6]; /* Volid */ 182 + __u16 version_id; /* Version identifier */ 183 + __u32 block_size; /* Disk block size */ 184 + __u32 origin_ptr; /* Disk origin pointer */ 185 + __u32 usable_count; /* Number of usable cylinders/blocks */ 186 + __u32 formatted_count; /* Maximum number of formatted cylinders/ 187 187 * blocks */ 188 - u32 block_count; /* Disk size in CMS blocks */ 189 - u32 used_count; /* Number of CMS blocks in use */ 190 - u32 fst_size; /* File Status Table (FST) size */ 191 - u32 fst_count; /* Number of FSTs per CMS block */ 192 - u8 format_date[6]; /* Disk FORMAT date */ 193 - u8 reserved1[2]; 194 - u32 disk_offset; /* Disk offset when reserved*/ 195 - u32 map_block; /* Allocation Map Block with next hole */ 196 - u32 hblk_disp; /* Displacement into HBLK data of next hole */ 197 - u32 user_disp; /* Displacement into user part of Allocation 188 + __u32 block_count; /* Disk size in CMS blocks */ 189 + __u32 used_count; /* Number of CMS blocks in use */ 190 + __u32 fst_size; /* File Status Table (FST) size */ 191 + __u32 fst_count; /* Number of FSTs per CMS block */ 192 + __u8 format_date[6]; /* Disk FORMAT date */ 193 + __u8 reserved1[2]; 194 + __u32 disk_offset; /* Disk offset when reserved*/ 195 + __u32 map_block; /* Allocation Map Block with next hole */ 196 + __u32 hblk_disp; /* Displacement into HBLK data of next hole */ 197 + __u32 user_disp; /* Displacement into user part of Allocation 198 198 * map */ 199 - u8 reserved2[4]; 200 - u8 segment_name[8]; /* Name of shared segment */ 199 + __u8 reserved2[4]; 200 + __u8 segment_name[8]; /* Name of shared segment */ 201 201 } __attribute__ ((packed)); 202 202 203 203 #endif /* _ASM_S390_VTOC_H */