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

hpfs: annotate struct hpfs_dirent

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 46287aa6 6ce2bbba

+12 -12
+4 -4
fs/hpfs/dnode.c
··· 153 153 } 154 154 de->length = cpu_to_le16(36); 155 155 de->down = 1; 156 - *(dnode_secno *)((char *)de + 32) = cpu_to_le32(ptr); 156 + *(__le32 *)((char *)de + 32) = cpu_to_le32(ptr); 157 157 } 158 158 } 159 159 ··· 177 177 memmove((char *)de + d_size, de, (char *)de_end - (char *)de); 178 178 memset(de, 0, d_size); 179 179 if (down_ptr) { 180 - *(dnode_secno *)((char *)de + d_size - 4) = cpu_to_le32(down_ptr); 180 + *(__le32 *)((char *)de + d_size - 4) = cpu_to_le32(down_ptr); 181 181 de->down = 1; 182 182 } 183 183 de->length = cpu_to_le16(d_size); ··· 656 656 del->down = 0; 657 657 d1->first_free = cpu_to_le32(le32_to_cpu(d1->first_free) - 4); 658 658 } else if (down) 659 - *(dnode_secno *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down); 659 + *(__le32 *) ((void *) del + le16_to_cpu(del->length) - 4) = cpu_to_le32(down); 660 660 } else goto endm; 661 661 if (!(de_cp = kmalloc(le16_to_cpu(de_prev->length), GFP_NOFS))) { 662 662 printk("HPFS: out of memory for dtree balancing\n"); ··· 672 672 de_prev->down = 1; 673 673 dnode->first_free = cpu_to_le32(le32_to_cpu(dnode->first_free) + 4); 674 674 } 675 - *(dnode_secno *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown); 675 + *(__le32 *) ((void *) de_prev + le16_to_cpu(de_prev->length) - 4) = cpu_to_le32(ndown); 676 676 hpfs_mark_4buffers_dirty(&qbh); 677 677 hpfs_brelse4(&qbh); 678 678 for_all_poss(i, hpfs_pos_subst, ((loff_t)up << 4) | (p - 1), 4);
+7 -7
fs/hpfs/hpfs.h
··· 300 300 }; 301 301 302 302 struct hpfs_dirent { 303 - u16 length; /* offset to next dirent */ 303 + __le16 length; /* offset to next dirent */ 304 304 305 305 #ifdef __LITTLE_ENDIAN 306 306 u8 first: 1; /* set on phony ^A^A (".") entry */ ··· 346 346 u8 read_only: 1; /* dos attrib */ 347 347 #endif 348 348 349 - fnode_secno fnode; /* fnode giving allocation info */ 350 - time32_t write_date; /* mtime */ 351 - u32 file_size; /* file length, bytes */ 352 - time32_t read_date; /* atime */ 353 - time32_t creation_date; /* ctime */ 354 - u32 ea_size; /* total EA length, bytes */ 349 + __le32 fnode; /* fnode giving allocation info */ 350 + __le32 write_date; /* mtime */ 351 + __le32 file_size; /* file length, bytes */ 352 + __le32 read_date; /* atime */ 353 + __le32 creation_date; /* ctime */ 354 + __le32 ea_size; /* total EA length, bytes */ 355 355 u8 no_of_acls; /* number of ACL's (low 3 bits) */ 356 356 u8 ix; /* code page index (of filename), see 357 357 struct code_page_data */
+1 -1
fs/hpfs/hpfs_fn.h
··· 100 100 static inline dnode_secno de_down_pointer (struct hpfs_dirent *de) 101 101 { 102 102 CHKCOND(de->down,("HPFS: de_down_pointer: !de->down\n")); 103 - return le32_to_cpu(*(dnode_secno *) ((void *) de + le16_to_cpu(de->length) - 4)); 103 + return le32_to_cpu(*(__le32 *) ((void *) de + le16_to_cpu(de->length) - 4)); 104 104 } 105 105 106 106 /* The first dir entry in a dnode */