wok diff grub/stuff/ext3_256byte_inode.diff @ rev 11304
Up: dosfstools (3.0.12)
author | Alexander Medvedev <devl547@gmail.com> |
---|---|
date | Sat Nov 12 23:03:56 2011 +0000 (2011-11-12) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/grub/stuff/ext3_256byte_inode.diff Sat Nov 12 23:03:56 2011 +0000 1.3 @@ -0,0 +1,102 @@ 1.4 + 1.5 +Patch from Red Hat. See #463236, #463123 (and #491076 for the reviewed version) 1.6 + 1.7 +diff -ur grub-0.97/stage2/fsys_ext2fs.c grub-0.97.new/stage2/fsys_ext2fs.c 1.8 +--- grub-0.97/stage2/fsys_ext2fs.c 2008-07-23 01:18:18.000000000 +0200 1.9 ++++ grub-0.97.new/stage2/fsys_ext2fs.c 2008-07-25 14:33:29.000000000 +0200 1.10 +@@ -79,7 +79,52 @@ 1.11 + __u32 s_rev_level; /* Revision level */ 1.12 + __u16 s_def_resuid; /* Default uid for reserved blocks */ 1.13 + __u16 s_def_resgid; /* Default gid for reserved blocks */ 1.14 +- __u32 s_reserved[235]; /* Padding to the end of the block */ 1.15 ++ /* 1.16 ++ * These fields are for EXT2_DYNAMIC_REV superblocks only. 1.17 ++ * 1.18 ++ * Note: the difference between the compatible feature set and 1.19 ++ * the incompatible feature set is that if there is a bit set 1.20 ++ * in the incompatible feature set that the kernel doesn't 1.21 ++ * know about, it should refuse to mount the filesystem. 1.22 ++ * 1.23 ++ * e2fsck's requirements are more strict; if it doesn't know 1.24 ++ * about a feature in either the compatible or incompatible 1.25 ++ * feature set, it must abort and not try to meddle with 1.26 ++ * things it doesn't understand... 1.27 ++ */ 1.28 ++ __u32 s_first_ino; /* First non-reserved inode */ 1.29 ++ __u16 s_inode_size; /* size of inode structure */ 1.30 ++ __u16 s_block_group_nr; /* block group # of this superblock */ 1.31 ++ __u32 s_feature_compat; /* compatible feature set */ 1.32 ++ __u32 s_feature_incompat; /* incompatible feature set */ 1.33 ++ __u32 s_feature_ro_compat; /* readonly-compatible feature set */ 1.34 ++ __u8 s_uuid[16]; /* 128-bit uuid for volume */ 1.35 ++ char s_volume_name[16]; /* volume name */ 1.36 ++ char s_last_mounted[64]; /* directory where last mounted */ 1.37 ++ __u32 s_algorithm_usage_bitmap; /* For compression */ 1.38 ++ /* 1.39 ++ * Performance hints. Directory preallocation should only 1.40 ++ * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on. 1.41 ++ */ 1.42 ++ __u8 s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ 1.43 ++ __u8 s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ 1.44 ++ __u16 s_reserved_gdt_blocks;/* Per group table for online growth */ 1.45 ++ /* 1.46 ++ * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set. 1.47 ++ */ 1.48 ++ __u8 s_journal_uuid[16]; /* uuid of journal superblock */ 1.49 ++ __u32 s_journal_inum; /* inode number of journal file */ 1.50 ++ __u32 s_journal_dev; /* device number of journal file */ 1.51 ++ __u32 s_last_orphan; /* start of list of inodes to delete */ 1.52 ++ __u32 s_hash_seed[4]; /* HTREE hash seed */ 1.53 ++ __u8 s_def_hash_version; /* Default hash version to use */ 1.54 ++ __u8 s_jnl_backup_type; /* Default type of journal backup */ 1.55 ++ __u16 s_reserved_word_pad; 1.56 ++ __u32 s_default_mount_opts; 1.57 ++ __u32 s_first_meta_bg; /* First metablock group */ 1.58 ++ __u32 s_mkfs_time; /* When the filesystem was created */ 1.59 ++ __u32 s_jnl_blocks[17]; /* Backup of the journal inode */ 1.60 ++ __u32 s_reserved[172]; /* Padding to the end of the block */ 1.61 + }; 1.62 + 1.63 + struct ext2_group_desc 1.64 +@@ -218,6 +263,14 @@ 1.65 + #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) 1.66 + #define EXT2_ADDR_PER_BLOCK_BITS(s) (log2(EXT2_ADDR_PER_BLOCK(s))) 1.67 + 1.68 ++#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ 1.69 ++#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ 1.70 ++#define EXT2_GOOD_OLD_INODE_SIZE 128 1.71 ++#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ 1.72 ++ EXT2_GOOD_OLD_INODE_SIZE : \ 1.73 ++ (s)->s_inode_size) 1.74 ++#define EXT2_INODES_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s)) 1.75 ++ 1.76 + /* linux/ext2_fs.h */ 1.77 + #define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) 1.78 + /* kind of from ext2/super.c */ 1.79 +@@ -553,7 +606,7 @@ 1.80 + gdp = GROUP_DESC; 1.81 + ino_blk = gdp[desc].bg_inode_table + 1.82 + (((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group)) 1.83 +- >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); 1.84 ++ >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK))); 1.85 + #ifdef E2DEBUG 1.86 + printf ("inode table fsblock=%d\n", ino_blk); 1.87 + #endif /* E2DEBUG */ 1.88 +@@ -565,13 +618,12 @@ 1.89 + /* reset indirect blocks! */ 1.90 + mapblock2 = mapblock1 = -1; 1.91 + 1.92 +- raw_inode = INODE + 1.93 +- ((current_ino - 1) 1.94 +- & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1)); 1.95 ++ raw_inode = (struct ext2_inode *)((char *)INODE + 1.96 ++ ((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) * 1.97 ++ EXT2_INODE_SIZE (SUPERBLOCK)); 1.98 + #ifdef E2DEBUG 1.99 + printf ("ipb=%d, sizeof(inode)=%d\n", 1.100 +- (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)), 1.101 +- sizeof (struct ext2_inode)); 1.102 ++ EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK)); 1.103 + printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode); 1.104 + printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE); 1.105 + for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;