# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1519901746 -3600
# Node ID b4680310d62ad02d82e2e5771044ef0f01e883a4
# Parent  e6d3b1fa06cdfee2f2de4606250f842e87c70b07
grub: add ext4 patch (again)

diff -r e6d3b1fa06cd -r b4680310d62a grub/stuff/ext3_256byte_inode+ext4.diff
--- a/grub/stuff/ext3_256byte_inode+ext4.diff	Thu Mar 01 11:52:40 2018 +0100
+++ b/grub/stuff/ext3_256byte_inode+ext4.diff	Thu Mar 01 11:55:46 2018 +0100
@@ -286,7 +286,7 @@
  /* linux/ext2_fs.h */
  #define EXT2_ADDR_PER_BLOCK(s)          (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
 -#define EXT2_ADDR_PER_BLOCK_BITS(s)		(log2(EXT2_ADDR_PER_BLOCK(s)))
-+#define EXT2_ADDR_PER_BLOCK_BITS(s)	(log2_tmp(EXT2_ADDR_PER_BLOCK(s)))
++#define EXT2_ADDR_PER_BLOCK_BITS(s)	(log2(EXT2_ADDR_PER_BLOCK(s)))
  
 +/* Revision levels */
 +#define EXT2_GOOD_OLD_REV	0	/* The good old (original) format */
@@ -701,7 +701,7 @@
        /* look up an inode */
        group_id = (current_ino - 1) / (SUPERBLOCK->s_inodes_per_group);
 -      group_desc = group_id >> log2 (EXT2_DESC_PER_BLOCK (SUPERBLOCK));
-+      group_desc = group_id >> log2_tmp (EXT2_DESC_PER_BLOCK (SUPERBLOCK));
++      group_desc = group_id >> log2 (EXT2_DESC_PER_BLOCK (SUPERBLOCK));
        desc = group_id & (EXT2_DESC_PER_BLOCK (SUPERBLOCK) - 1);
  #ifdef E2DEBUG
        printf ("ipg=%d, dpb=%d\n", SUPERBLOCK->s_inodes_per_group,
@@ -722,7 +722,7 @@
 +      ino_blk = ext4_gdp->bg_inode_table + 
  	(((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
 -	 >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)));
-+	 >> log2_tmp (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
++	 >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
  #ifdef E2DEBUG
        printf ("inode table fsblock=%d\n", ino_blk);
  #endif /* E2DEBUG */