ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch

   1 Index: linux-2.6.5-7.283/fs/ext3/ialloc.c
   2 ===================================================================
   3 --- linux-2.6.5-7.283.orig/fs/ext3/ialloc.c
   4 +++ linux-2.6.5-7.283/fs/ext3/ialloc.c
   5 @@ -613,7 +613,8 @@ got:
   6         /* This is the optimal IO size (for stat), not the fs block size */
   7         inode->i_blksize = PAGE_SIZE;
   8         inode->i_blocks = 0;
   9 -       inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
  10 +       inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
  11 +                                                              CURRENT_TIME;
  12
  13         memset(ei->i_data, 0, sizeof(ei->i_data));
  14         ei->i_next_alloc_block = 0;
  15 @@ -651,9 +652,8 @@ got:
  16         spin_unlock(&sbi->s_next_gen_lock);
  17
  18         ei->i_state = EXT3_STATE_NEW;
  19 -       ei->i_extra_isize =
  20 -               (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE) ?
  21 -               sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0;
  22 +
  23 +       ei->i_extra_isize = EXT3_SB(sb)->s_want_extra_isize;
  24
  25         ret = inode;
  26         if(DQUOT_ALLOC_INODE(inode)) {
  27 Index: linux-2.6.5-7.283/fs/ext3/inode.c
  28 ===================================================================
  29 --- linux-2.6.5-7.283.orig/fs/ext3/inode.c
  30 +++ linux-2.6.5-7.283/fs/ext3/inode.c
  31 @@ -2459,7 +2459,11 @@ void ext3_read_inode(struct inode * inod
  32         inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
  33         inode->i_ctime.tv_sec = le32_to_cpu(raw_inode->i_ctime);
  34         inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->i_mtime);
  35 -       inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_mtime.tv_nsec = 0;
  36 +       if (EXT3_FITS_IN_INODE(raw_inode, ei, i_crtime)) {
  37 +               ei->i_crtime.tv_sec = le32_to_cpu(raw_inode->i_crtime);
  38 +       }
  39 +       inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_mtime.tv_nsec =
  40 +                                                           ei->i_crtime.tv_nsec = 0;
  41
  42         ei->i_state = 0;
  43         ei->i_next_alloc_block = 0;
  44 @@ -2603,6 +2607,10 @@ static int ext3_do_update_inode(handle_t
  45         raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
  46         raw_inode->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
  47         raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
  48 +       if (EXT3_FITS_IN_INODE(raw_inode, ei, i_crtime)) {
  49 +               raw_inode->i_crtime = cpu_to_le32(ei->i_crtime.tv_sec);
  50 +       }
  51 +
  52         raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
  53         raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
  54         raw_inode->i_flags = cpu_to_le32(ei->i_flags);
  55 Index: linux-2.6.5-7.283/fs/ext3/super.c
  56 ===================================================================
  57 --- linux-2.6.5-7.283.orig/fs/ext3/super.c
  58 +++ linux-2.6.5-7.283/fs/ext3/super.c
  59 @@ -1515,6 +1515,32 @@ static int ext3_fill_super (struct super
  60         }
  61
  62         ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
  63 +
  64 +       /* determine the minimum size of new large inodes, if present */
  65 +       if (sbi->s_inode_size > EXT3_GOOD_OLD_INODE_SIZE) {
  66 +               sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
  67 +                                                    EXT3_GOOD_OLD_INODE_SIZE;
  68 +               if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
  69 +                                      EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
  70 +                       if (sbi->s_want_extra_isize <
  71 +                           le16_to_cpu(es->s_want_extra_isize))
  72 +                               sbi->s_want_extra_isize =
  73 +                                       le16_to_cpu(es->s_want_extra_isize);
  74 +                       if (sbi->s_want_extra_isize <
  75 +                           le16_to_cpu(es->s_min_extra_isize))
  76 +                               sbi->s_want_extra_isize =
  77 +                                       le16_to_cpu(es->s_min_extra_isize);
  78 +               }
  79 +       }
  80 +       /* Check if enough inode space is available */
  81 +       if (EXT3_GOOD_OLD_INODE_SIZE + sbi->s_want_extra_isize >
  82 +                                                       sbi->s_inode_size) {
  83 +               sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
  84 +                                                      EXT3_GOOD_OLD_INODE_SIZE;
  85 +               printk(KERN_INFO "EXT3-fs: required extra inode space not"
  86 +                       "available.\n");
  87 +       }
  88 +
  89         /*
  90          * akpm: core read_super() calls in here with the superblock locked.
  91          * That deadlocks, because orphan cleanup needs to lock the superblock
  92 Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
  93 ===================================================================
  94 --- linux-2.6.5-7.283.orig/include/linux/ext3_fs.h
  95 +++ linux-2.6.5-7.283/include/linux/ext3_fs.h
  96 @@ -232,7 +232,7 @@ struct ext3_inode {
  97         __u16   i_uid;          /* Low 16 bits of Owner Uid */
  98         __u32   i_size;         /* Size in bytes */
  99         __u32   i_atime;        /* Access time */
 100 -       __u32   i_ctime;        /* Creation time */
 101 +       __u32   i_ctime;        /* Inode Change time */
 102         __u32   i_mtime;        /* Modification time */
 103         __u32   i_dtime;        /* Deletion Time */
 104         __u16   i_gid;          /* Low 16 bits of Group Id */
 105 @@ -281,10 +281,25 @@ struct ext3_inode {
 106         } osd2;                         /* OS dependent 2 */
 107         __u16   i_extra_isize;
 108         __u16   i_pad1;
 109 +       __le32  i_ctime_extra;  /* extra Change time      (nsec << 2 | epoch) */
 110 +       __le32  i_mtime_extra;  /* extra Modification time(nsec << 2 | epoch) */
 111 +       __le32  i_atime_extra;  /* extra Access time      (nsec << 2 | epoch) */
 112 +       __le32  i_crtime;       /* File Creation time */
 113 +       __le32  i_crtime_extra; /* extra File Creation time (nsec << 2 | epoch) */
 114  };
 115
 116  #define i_size_high    i_dir_acl
 117
 118 +#define EXT3_EPOCH_BITS 2
 119 +#define EXT3_EPOCH_MASK ((1 << EXT3_EPOCH_BITS) - 1)
 120 +#define EXT3_NSEC_MASK  (~0UL << EXT3_EPOCH_BITS)
 121 +
 122 +#define EXT3_FITS_IN_INODE(ext3_inode, einode, field)  \
 123 +       ((offsetof(typeof(*ext3_inode), field) +        \
 124 +        sizeof((ext3_inode)->field))                   \
 125 +        <= (EXT3_GOOD_OLD_INODE_SIZE +                 \
 126 +            (einode)->i_extra_isize))                  \
 127 +
 128  #if defined(__KERNEL__) || defined(__linux__)
 129  #define i_reserved1    osd1.linux1.l_i_reserved1
 130  #define i_frag         osd2.linux2.l_i_frag
 131 @@ -460,11 +475,19 @@ struct ext3_super_block {
 132         __u32   s_last_orphan;          /* start of list of inodes to delete */
 133         __u32   s_hash_seed[4];         /* HTREE hash seed */
 134         __u8    s_def_hash_version;     /* Default hash version to use */
 135 -       __u8    s_reserved_char_pad;
 136 -       __u16   s_reserved_word_pad;
 137 +       __u8    s_jnl_backup_type;      /* Default type of journal backup */
 138 +       __u16   s_desc_size;            /* Group desc. size: INCOMPAT_64BIT */
 139         __u32   s_default_mount_opts;
 140 -       __u32   s_first_meta_bg;        /* First metablock block group */
 141 -       __u32   s_reserved[190];        /* Padding to the end of the block */
 142 +       __u32   s_first_meta_bg;        /* First metablock block group */
 143 +       __u32   s_mkfs_time;            /* When the filesystem was created */
 144 +       __u32   s_jnl_blocks[17];       /* Backup of the journal inode */
 145 +       __u32   s_blocks_count_hi;      /* Blocks count high 32 bits */
 146 +       __u32   s_r_blocks_count_hi;    /* Reserved blocks count high 32 bits*/
 147 +       __u32   s_free_blocks_hi;       /* Free blocks count high 32 bits */
 148 +       __u16   s_min_extra_isize;      /* All inodes have at least # bytes */
 149 +       __u16   s_want_extra_isize;     /* New inodes should reserve # bytes */
 150 +       __u32   s_flags;                /* Miscellaneous flags */
 151 +       __u32   s_reserved[167];        /* Padding to the end of the block */
 152  };
 153
 154  #ifdef __KERNEL__
 155 @@ -539,6 +556,7 @@ static inline struct ext3_inode_info *EX
 156  #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR       0x0004
 157  #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM                0x0010
 158  #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK       0x0020
 159 +#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE     0x0040
 160
 161  #define EXT3_FEATURE_INCOMPAT_COMPRESSION      0x0001
 162  #define EXT3_FEATURE_INCOMPAT_FILETYPE         0x0002
 163 @@ -555,6 +573,7 @@ static inline struct ext3_inode_info *EX
 164                                          EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
 165                                          EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
 166                                          EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
 167 +                                        EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
 168                                          EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
 169
 170  /*
 171 Index: linux-2.6.5-7.283/include/linux/ext3_fs_i.h
 172 ===================================================================
 173 --- linux-2.6.5-7.283.orig/include/linux/ext3_fs_i.h
 174 +++ linux-2.6.5-7.283/include/linux/ext3_fs_i.h
 175 @@ -130,6 +130,7 @@ struct ext3_inode_info {
 176
 177         /* on-disk additional length */
 178         __u16 i_extra_isize;
 179 +       struct timespec i_crtime;
 180
 181         /*
 182          * truncate_sem is for serialising ext3_truncate() against
 183 Index: linux-2.6.5-7.283/include/linux/ext3_fs_sb.h
 184 ===================================================================
 185 --- linux-2.6.5-7.283.orig/include/linux/ext3_fs_sb.h
 186 +++ linux-2.6.5-7.283/include/linux/ext3_fs_sb.h
 187 @@ -71,6 +71,8 @@ struct ext3_sb_info {
 188         /* Last group used to allocate inode */
 189         int s_last_alloc_group;
 190
 191 +       unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */
 192 +
 193         /* root of the per fs reservation window tree */
 194         spinlock_t s_rsv_window_lock;
 195         struct rb_root s_rsv_window_root;