Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

Location:

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs

Files:

• ext2_fs.h (modified) (1 diff)
• ext2fs.h (modified) (1 diff)
• ext2fs_inline.c (modified) (1 diff)
• get_pathname.c (modified) (1 diff)
• getsize.c (modified) (1 diff)
• initialize.c (modified) (1 diff)

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2_fs.h

@@ -476 +476 @@
 #define EXT3_FEATURE_COMPAT_HAS_JOURNAL     0x0004
 #define EXT2_FEATURE_COMPAT_EXT_ATTR        0x0008
-#define EXT2_FEATURE_COMPAT_RESIZE_INODE    0x0010
+#define EXT2_FEATURE_COMPAT_RESIZE_INO      0x0010
 #define EXT2_FEATURE_COMPAT_DIR_INDEX       0x0020
 

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs.h

@@ -384 +384 @@
                      EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
                      EXT3_FEATURE_COMPAT_HAS_JOURNAL|\
-                     EXT2_FEATURE_COMPAT_RESIZE_INODE|\
+                     EXT2_FEATURE_COMPAT_RESIZE_INO|\
                      EXT2_FEATURE_COMPAT_DIR_INDEX|\
                      EXT2_FEATURE_COMPAT_EXT_ATTR)

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c

@@ -156 +156 @@
                     struct ext2_inode *inode)
 {
-       return inode->i_blocks -
-          (inode->i_file_acl ? fs->blocksize >> 9 : 0);
+    return inode->i_blocks -
+        (inode->i_file_acl ? fs->blocksize >> 9 : 0);
 }
 

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/get_pathname.c

@@ -16 +16 @@
  *  directory inode, and <ino> is the inode number itself.  If
  *  <ino> is zero, then ext2fs_get_pathname will return pathname
- *  of the the directory <dir>.
+ *  of the directory <dir>.
  *
  */

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c

@@ -175 +175 @@
 #ifdef BLKGETSIZE64
 #ifdef __linux__
-    if ((uname(&ut) == 0) &&
-        ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-         (ut.release[2] < '6') && (ut.release[3] == '.')))
+    uname(&ut);
+    if ((ut.release[0] == '2') && (ut.release[1] == '.') &&
+         (ut.release[2] < '6') && (ut.release[3] == '.'))
         valid_blkgetsize64 = 0;
 #endif

branches/3.2/mindi-busybox/e2fsprogs/old_e2fsprogs/ext2fs/initialize.c

@@ -285 +285 @@
      * check the number of reserved group descriptor table blocks
      */
-    if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
+    if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INO)
         rsv_gdt = calc_reserved_gdt_blocks(fs);
     else