wok-current rev 20227
grub: add ext4 patch (again)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Mar 01 11:55:46 2018 +0100 (2018-03-01) |
parents | e6d3b1fa06cd |
children | 12f947645264 |
files | grub/stuff/ext3_256byte_inode+ext4.diff |
line diff
1.1 --- a/grub/stuff/ext3_256byte_inode+ext4.diff Thu Mar 01 11:52:40 2018 +0100 1.2 +++ b/grub/stuff/ext3_256byte_inode+ext4.diff Thu Mar 01 11:55:46 2018 +0100 1.3 @@ -286,7 +286,7 @@ 1.4 /* linux/ext2_fs.h */ 1.5 #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) 1.6 -#define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) 1.7 -+#define EXT2_ADDR_PER_BLOCK_BITS(s) (log2_tmp(EXT2_ADDR_PER_BLOCK(s))) 1.8 ++#define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) 1.9 1.10 +/* Revision levels */ 1.11 +#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ 1.12 @@ -701,7 +701,7 @@ 1.13 /* look up an inode */ 1.14 group_id = (current_ino - 1) / (SUPERBLOCK->s_inodes_per_group); 1.15 - group_desc = group_id >> log2 (EXT2_DESC_PER_BLOCK (SUPERBLOCK)); 1.16 -+ group_desc = group_id >> log2_tmp (EXT2_DESC_PER_BLOCK (SUPERBLOCK)); 1.17 ++ group_desc = group_id >> log2 (EXT2_DESC_PER_BLOCK (SUPERBLOCK)); 1.18 desc = group_id & (EXT2_DESC_PER_BLOCK (SUPERBLOCK) - 1); 1.19 #ifdef E2DEBUG 1.20 printf ("ipg=%d, dpb=%d\n", SUPERBLOCK->s_inodes_per_group, 1.21 @@ -722,7 +722,7 @@ 1.22 + ino_blk = ext4_gdp->bg_inode_table + 1.23 (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) 1.24 - >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); 1.25 -+ >> log2_tmp (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); 1.26 ++ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); 1.27 #ifdef E2DEBUG 1.28 printf ("inode table fsblock=%d\n", ino_blk); 1.29 #endif /* E2DEBUG */