1 Index: linux-2.6.16.54-0.2.3/fs/ext3/ialloc.c
2 ===================================================================
3 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/ialloc.c
4 +++ linux-2.6.16.54-0.2.3/fs/ext3/ialloc.c
5 @@ -727,7 +727,8 @@ got:
6 /* This is the optimal IO size (for stat), not the fs block size */
7 inode->i_blksize = PAGE_SIZE;
9 - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
10 + inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
11 + ext3_current_time(inode);
13 memset(ei->i_data, 0, sizeof(ei->i_data));
14 ei->i_dir_start_lookup = 0;
15 @@ -759,9 +760,8 @@ got:
16 spin_unlock(&sbi->s_next_gen_lock);
18 ei->i_state = EXT3_STATE_NEW;
20 - (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE) ?
21 - sizeof(struct ext3_inode) - EXT3_GOOD_OLD_INODE_SIZE : 0;
23 + ei->i_extra_isize = EXT3_SB(sb)->s_want_extra_isize;
26 if(DQUOT_ALLOC_INODE(inode)) {
27 Index: linux-2.6.16.54-0.2.3/fs/ext3/inode.c
28 ===================================================================
29 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/inode.c
30 +++ linux-2.6.16.54-0.2.3/fs/ext3/inode.c
31 @@ -621,7 +621,7 @@ static int ext3_splice_branch(handle_t *
33 /* We are done with atomic stuff, now do the rest of housekeeping */
35 - inode->i_ctime = CURRENT_TIME_SEC;
36 + inode->i_ctime = ext3_current_time(inode);
37 ext3_mark_inode_dirty(handle, inode);
39 /* had we spliced it onto indirect block? */
40 @@ -2248,7 +2248,7 @@ do_indirects:
41 ext3_discard_reservation(inode);
43 up(&ei->truncate_sem);
44 - inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
45 + inode->i_mtime = inode->i_ctime = ext3_current_time(inode);
46 ext3_mark_inode_dirty(handle, inode);
48 /* In a multi-transaction truncate, we only make the final
49 @@ -2482,10 +2482,6 @@ void ext3_read_inode(struct inode * inod
51 inode->i_nlink = le16_to_cpu(raw_inode->i_links_count);
52 inode->i_size = le32_to_cpu(raw_inode->i_size);
53 - inode->i_atime.tv_sec = le32_to_cpu(raw_inode->i_atime);
54 - inode->i_ctime.tv_sec = le32_to_cpu(raw_inode->i_ctime);
55 - inode->i_mtime.tv_sec = le32_to_cpu(raw_inode->i_mtime);
56 - inode->i_atime.tv_nsec = inode->i_ctime.tv_nsec = inode->i_mtime.tv_nsec = 0;
59 ei->i_dir_start_lookup = 0;
60 @@ -2560,6 +2556,11 @@ void ext3_read_inode(struct inode * inod
62 ei->i_extra_isize = 0;
64 + EXT3_INODE_GET_XTIME(i_ctime, inode, raw_inode);
65 + EXT3_INODE_GET_XTIME(i_mtime, inode, raw_inode);
66 + EXT3_INODE_GET_XTIME(i_atime, inode, raw_inode);
67 + EXT3_EINODE_GET_XTIME(i_crtime, ei, raw_inode);
69 if (S_ISREG(inode->i_mode)) {
70 inode->i_op = &ext3_file_inode_operations;
71 inode->i_fop = &ext3_file_operations;
72 @@ -2640,9 +2641,12 @@ static int ext3_do_update_inode(handle_t
74 raw_inode->i_links_count = cpu_to_le16(inode->i_nlink);
75 raw_inode->i_size = cpu_to_le32(ei->i_disksize);
76 - raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec);
77 - raw_inode->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
78 - raw_inode->i_mtime = cpu_to_le32(inode->i_mtime.tv_sec);
80 + EXT3_INODE_SET_XTIME(i_ctime, inode, raw_inode);
81 + EXT3_INODE_SET_XTIME(i_mtime, inode, raw_inode);
82 + EXT3_INODE_SET_XTIME(i_atime, inode, raw_inode);
83 + EXT3_EINODE_SET_XTIME(i_crtime, ei, raw_inode);
85 raw_inode->i_blocks = cpu_to_le32(inode->i_blocks);
86 raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
87 raw_inode->i_flags = cpu_to_le32(ei->i_flags);
88 Index: linux-2.6.16.54-0.2.3/fs/ext3/ioctl.c
89 ===================================================================
90 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/ioctl.c
91 +++ linux-2.6.16.54-0.2.3/fs/ext3/ioctl.c
92 @@ -114,7 +114,7 @@ int ext3_ioctl (struct inode * inode, st
95 ext3_set_inode_flags(inode);
96 - inode->i_ctime = CURRENT_TIME_SEC;
97 + inode->i_ctime = ext3_current_time(inode);
99 err = ext3_mark_iloc_dirty(handle, inode, &iloc);
101 @@ -152,7 +152,7 @@ flags_err:
102 return PTR_ERR(handle);
103 err = ext3_reserve_inode_write(handle, inode, &iloc);
105 - inode->i_ctime = CURRENT_TIME_SEC;
106 + inode->i_ctime = ext3_current_time(inode);
107 inode->i_generation = generation;
108 err = ext3_mark_iloc_dirty(handle, inode, &iloc);
110 Index: linux-2.6.16.54-0.2.3/fs/ext3/namei.c
111 ===================================================================
112 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/namei.c
113 +++ linux-2.6.16.54-0.2.3/fs/ext3/namei.c
114 @@ -1296,7 +1296,7 @@ static int add_dirent_to_buf(handle_t *h
115 * happen is that the times are slightly out of date
116 * and/or different from the directory change time.
118 - dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
119 + dir->i_mtime = dir->i_ctime = ext3_current_time(dir);
120 ext3_update_dx_flag(dir);
122 ext3_mark_inode_dirty(handle, dir);
123 @@ -2090,7 +2090,7 @@ static int ext3_rmdir (struct inode * di
126 ext3_orphan_add(handle, inode);
127 - inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
128 + inode->i_ctime = dir->i_ctime = dir->i_mtime = ext3_current_time(inode);
129 ext3_mark_inode_dirty(handle, inode);
130 ext3_dec_count(handle, dir);
131 ext3_update_dx_flag(dir);
132 @@ -2140,13 +2140,13 @@ static int ext3_unlink(struct inode * di
133 retval = ext3_delete_entry(handle, dir, de, bh);
136 - dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
137 + dir->i_ctime = dir->i_mtime = ext3_current_time(dir);
138 ext3_update_dx_flag(dir);
139 ext3_mark_inode_dirty(handle, dir);
140 ext3_dec_count(handle, inode);
142 ext3_orphan_add(handle, inode);
143 - inode->i_ctime = dir->i_ctime;
144 + inode->i_ctime = ext3_current_time(inode);
145 ext3_mark_inode_dirty(handle, inode);
148 @@ -2248,7 +2248,7 @@ retry:
152 - inode->i_ctime = CURRENT_TIME_SEC;
153 + inode->i_ctime = ext3_current_time(inode);
154 ext3_inc_count(handle, inode);
155 atomic_inc(&inode->i_count);
157 @@ -2351,7 +2351,7 @@ static int ext3_rename (struct inode * o
158 * Like most other Unix systems, set the ctime for inodes on a
161 - old_inode->i_ctime = CURRENT_TIME_SEC;
162 + old_inode->i_ctime = ext3_current_time(old_inode);
163 ext3_mark_inode_dirty(handle, old_inode);
166 @@ -2384,9 +2384,9 @@ static int ext3_rename (struct inode * o
169 ext3_dec_count(handle, new_inode);
170 - new_inode->i_ctime = CURRENT_TIME_SEC;
171 + new_inode->i_ctime = ext3_current_time(new_inode);
173 - old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME_SEC;
174 + old_dir->i_ctime = old_dir->i_mtime = ext3_current_time(old_dir);
175 ext3_update_dx_flag(old_dir);
177 BUFFER_TRACE(dir_bh, "get_write_access");
178 Index: linux-2.6.16.54-0.2.3/fs/ext3/super.c
179 ===================================================================
180 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/super.c
181 +++ linux-2.6.16.54-0.2.3/fs/ext3/super.c
182 @@ -1709,6 +1709,8 @@ static int ext3_fill_super (struct super
186 + if (sbi->s_inode_size > EXT3_GOOD_OLD_INODE_SIZE)
187 + sb->s_time_gran = 1 << (EXT3_EPOCH_BITS - 2);
189 sbi->s_frag_size = EXT3_MIN_FRAG_SIZE <<
190 le32_to_cpu(es->s_log_frag_size);
191 @@ -1904,6 +1906,32 @@ static int ext3_fill_super (struct super
194 ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY);
196 + /* determine the minimum size of new large inodes, if present */
197 + if (sbi->s_inode_size > EXT3_GOOD_OLD_INODE_SIZE) {
198 + sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
199 + EXT3_GOOD_OLD_INODE_SIZE;
200 + if (EXT3_HAS_RO_COMPAT_FEATURE(sb,
201 + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) {
202 + if (sbi->s_want_extra_isize <
203 + le16_to_cpu(es->s_want_extra_isize))
204 + sbi->s_want_extra_isize =
205 + le16_to_cpu(es->s_want_extra_isize);
206 + if (sbi->s_want_extra_isize <
207 + le16_to_cpu(es->s_min_extra_isize))
208 + sbi->s_want_extra_isize =
209 + le16_to_cpu(es->s_min_extra_isize);
212 + /* Check if enough inode space is available */
213 + if (EXT3_GOOD_OLD_INODE_SIZE + sbi->s_want_extra_isize >
214 + sbi->s_inode_size) {
215 + sbi->s_want_extra_isize = sizeof(struct ext3_inode) -
216 + EXT3_GOOD_OLD_INODE_SIZE;
217 + printk(KERN_INFO "EXT3-fs: required extra inode space not"
222 * akpm: core read_super() calls in here with the superblock locked.
223 * That deadlocks, because orphan cleanup needs to lock the superblock
224 Index: linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
225 ===================================================================
226 --- linux-2.6.16.54-0.2.3.orig/fs/ext3/xattr.c
227 +++ linux-2.6.16.54-0.2.3/fs/ext3/xattr.c
228 @@ -1006,7 +1006,7 @@ ext3_xattr_set_handle(handle_t *handle,
231 ext3_xattr_update_super_block(handle, inode->i_sb);
232 - inode->i_ctime = CURRENT_TIME_SEC;
233 + inode->i_ctime = ext3_current_time(inode);
234 error = ext3_mark_iloc_dirty(handle, inode, &is.iloc);
236 * The bh is consumed by ext3_mark_iloc_dirty, even with
237 Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
238 ===================================================================
239 --- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs.h
240 +++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs.h
241 @@ -294,7 +294,7 @@ struct ext3_inode {
242 __le16 i_uid; /* Low 16 bits of Owner Uid */
243 __le32 i_size; /* Size in bytes */
244 __le32 i_atime; /* Access time */
245 - __le32 i_ctime; /* Creation time */
246 + __le32 i_ctime; /* Inode Change time */
247 __le32 i_mtime; /* Modification time */
248 __le32 i_dtime; /* Deletion Time */
249 __le16 i_gid; /* Low 16 bits of Group Id */
250 @@ -343,10 +343,73 @@ struct ext3_inode {
251 } osd2; /* OS dependent 2 */
252 __le16 i_extra_isize;
254 + __le32 i_ctime_extra; /* extra Change time (nsec << 2 | epoch) */
255 + __le32 i_mtime_extra; /* extra Modification time(nsec << 2 | epoch) */
256 + __le32 i_atime_extra; /* extra Access time (nsec << 2 | epoch) */
257 + __le32 i_crtime; /* File Creation time */
258 + __le32 i_crtime_extra; /* extra File Creation time (nsec << 2 | epoch) */
261 #define i_size_high i_dir_acl
263 +#define EXT3_EPOCH_BITS 2
264 +#define EXT3_EPOCH_MASK ((1 << EXT3_EPOCH_BITS) - 1)
265 +#define EXT3_NSEC_MASK (~0UL << EXT3_EPOCH_BITS)
267 +#define EXT3_FITS_IN_INODE(ext3_inode, einode, field) \
268 + ((offsetof(typeof(*ext3_inode), field) + \
269 + sizeof((ext3_inode)->field)) \
270 + <= (EXT3_GOOD_OLD_INODE_SIZE + \
271 + (einode)->i_extra_isize)) \
273 +static inline __le32 ext3_encode_extra_time(struct timespec *time)
275 + return cpu_to_le32((sizeof(time->tv_sec) > 4 ?
276 + time->tv_sec >> 32 : 0) |
277 + ((time->tv_nsec << 2) & EXT3_NSEC_MASK));
280 +static inline void ext3_decode_extra_time(struct timespec *time, __le32 extra) {
281 + if (sizeof(time->tv_sec) > 4)
282 + time->tv_sec |= (__u64)(le32_to_cpu(extra) & EXT3_EPOCH_MASK)
284 + time->tv_nsec = (le32_to_cpu(extra) & EXT3_NSEC_MASK) >> 2;
287 +#define EXT3_INODE_SET_XTIME(xtime, inode, raw_inode) \
289 + (raw_inode)->xtime = cpu_to_le32((inode)->xtime.tv_sec); \
290 + if (EXT3_FITS_IN_INODE(raw_inode, EXT3_I(inode), xtime ## _extra)) \
291 + (raw_inode)->xtime ## _extra = \
292 + ext3_encode_extra_time(&(inode)->xtime); \
295 +#define EXT3_EINODE_SET_XTIME(xtime, einode, raw_inode) \
297 + if (EXT3_FITS_IN_INODE(raw_inode, einode, xtime)) \
298 + (raw_inode)->xtime = cpu_to_le32((einode)->xtime.tv_sec); \
299 + if (EXT3_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \
300 + (raw_inode)->xtime ## _extra = \
301 + ext3_encode_extra_time(&(einode)->xtime); \
304 +#define EXT3_INODE_GET_XTIME(xtime, inode, raw_inode) \
306 + (inode)->xtime.tv_sec = le32_to_cpu((raw_inode)->xtime); \
307 + if (EXT3_FITS_IN_INODE(raw_inode, EXT3_I(inode), xtime ## _extra))\
308 + ext3_decode_extra_time(&(inode)->xtime, \
309 + raw_inode->xtime ## _extra); \
312 +#define EXT3_EINODE_GET_XTIME(xtime, einode, raw_inode) \
314 + if (EXT3_FITS_IN_INODE(raw_inode, einode, xtime)) \
315 + (einode)->xtime.tv_sec = le32_to_cpu((raw_inode)->xtime);\
316 + if (EXT3_FITS_IN_INODE(raw_inode, einode, xtime ## _extra)) \
317 + ext3_decode_extra_time(&(einode)->xtime, \
318 + raw_inode->xtime ## _extra); \
321 #if defined(__KERNEL__) || defined(__linux__)
322 #define i_reserved1 osd1.linux1.l_i_reserved1
323 #define i_frag osd2.linux2.l_i_frag
324 @@ -526,11 +589,19 @@ struct ext3_super_block {
325 __le32 s_last_orphan; /* start of list of inodes to delete */
326 __le32 s_hash_seed[4]; /* HTREE hash seed */
327 __u8 s_def_hash_version; /* Default hash version to use */
328 - __u8 s_reserved_char_pad;
329 - __u16 s_reserved_word_pad;
330 + __u8 s_jnl_backup_type; /* Default type of journal backup */
331 + __le16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */
332 __le32 s_default_mount_opts;
333 - __le32 s_first_meta_bg; /* First metablock block group */
334 - __u32 s_reserved[190]; /* Padding to the end of the block */
335 + __le32 s_first_meta_bg; /* First metablock block group */
336 + __le32 s_mkfs_time; /* When the filesystem was created */
337 + __le32 s_jnl_blocks[17]; /* Backup of the journal inode */
338 + __le32 s_blocks_count_hi; /* Blocks count high 32 bits */
339 + __le32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/
340 + __le32 s_free_blocks_hi; /* Free blocks count high 32 bits */
341 + __le16 s_min_extra_isize; /* All inodes have at least # bytes */
342 + __le16 s_want_extra_isize; /* New inodes should reserve # bytes */
343 + __le32 s_flags; /* Miscellaneous flags */
344 + __u32 s_reserved[167]; /* Padding to the end of the block */
348 @@ -615,6 +686,8 @@ static inline int ext3_valid_inum(struct
349 #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
350 #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010
351 #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
352 +#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040
355 #define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
356 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002
357 @@ -632,6 +705,7 @@ static inline int ext3_valid_inum(struct
358 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
359 EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
360 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
361 + EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \
362 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
365 @@ -759,6 +833,12 @@ static inline struct ext3_inode *ext3_ra
366 return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset);
369 +static inline struct timespec ext3_current_time(struct inode *inode)
371 + return (inode->i_sb->s_time_gran < NSEC_PER_SEC) ?
372 + current_fs_time(inode->i_sb) : CURRENT_TIME_SEC;
376 * This structure is stuffed into the struct file's private_data field
377 * for directories. It is where we put information so that we can do
378 Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
379 ===================================================================
380 --- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs_i.h
381 +++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs_i.h
382 @@ -120,6 +120,7 @@ struct ext3_inode_info {
384 /* on-disk additional length */
386 + struct timespec i_crtime;
389 * truncate_sem is for serialising ext3_truncate() against
390 Index: linux-2.6.16.54-0.2.3/include/linux/ext3_fs_sb.h
391 ===================================================================
392 --- linux-2.6.16.54-0.2.3.orig/include/linux/ext3_fs_sb.h
393 +++ linux-2.6.16.54-0.2.3/include/linux/ext3_fs_sb.h
394 @@ -68,6 +68,8 @@ struct ext3_sb_info {
395 /* Last group used to allocate inode */
396 int s_last_alloc_group;
398 + unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */
400 /* root of the per fs reservation window tree */
401 spinlock_t s_rsv_window_lock;
402 struct rb_root s_rsv_window_root;