X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext3-nanosecond-2.6-sles10.patch;h=86fce30b3c3c2a27a15381a37487974a065e2b66;hb=8fe1b87d18f97815b6941fab00f059e1ea319490;hp=1960ae113682c9ccffa5534077d2860425dc13be;hpb=4d72389a70d651e0e3fe5d54af0d0dd5019d2eb5;p=fs%2Flustre-release.git diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch index 1960ae1..86fce30 100644 --- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch +++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-sles10.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.16.27-0.9/fs/ext3/ialloc.c +Index: linux-2.6.16-sles10/fs/ext3/ialloc.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/ialloc.c -+++ linux-2.6.16.27-0.9/fs/ext3/ialloc.c -@@ -577,7 +577,8 @@ got: +--- linux-2.6.16-sles10.orig/fs/ext3/ialloc.c ++++ linux-2.6.16-sles10/fs/ext3/ialloc.c +@@ -727,7 +727,8 @@ got: /* This is the optimal IO size (for stat), not the fs block size */ inode->i_blksize = PAGE_SIZE; inode->i_blocks = 0; @@ -12,7 +12,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/ialloc.c memset(ei->i_data, 0, sizeof(ei->i_data)); ei->i_dir_start_lookup = 0; -@@ -609,9 +610,8 @@ got: +@@ -759,9 +760,8 @@ got: spin_unlock(&sbi->s_next_gen_lock); ei->i_state = EXT3_STATE_NEW; @@ -24,11 +24,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/ialloc.c ret = inode; if(DQUOT_ALLOC_INODE(inode)) { -Index: linux-2.6.16.27-0.9/fs/ext3/inode.c +Index: linux-2.6.16-sles10/fs/ext3/inode.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/inode.c -+++ linux-2.6.16.27-0.9/fs/ext3/inode.c -@@ -620,7 +620,7 @@ static int ext3_splice_branch(handle_t * +--- linux-2.6.16-sles10.orig/fs/ext3/inode.c ++++ linux-2.6.16-sles10/fs/ext3/inode.c +@@ -621,7 +621,7 @@ static int ext3_splice_branch(handle_t * /* We are done with atomic stuff, now do the rest of housekeeping */ @@ -37,7 +37,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c ext3_mark_inode_dirty(handle, inode); /* had we spliced it onto indirect block? */ -@@ -2244,7 +2244,7 @@ do_indirects: +@@ -2248,7 +2248,7 @@ do_indirects: ext3_discard_reservation(inode); up(&ei->truncate_sem); @@ -46,7 +46,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c ext3_mark_inode_dirty(handle, inode); /* In a multi-transaction truncate, we only make the final -@@ -2479,10 +2479,6 @@ void ext3_read_inode(struct inode * inod +@@ -2482,10 +2482,6 @@ void ext3_read_inode(struct inode * inod } inode->i_nlink = le16_to_cpu(raw_inode->i_links_count); inode->i_size = le32_to_cpu(raw_inode->i_size); @@ -57,7 +57,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c ei->i_state = 0; ei->i_dir_start_lookup = 0; -@@ -2557,6 +2553,11 @@ void ext3_read_inode(struct inode * inod +@@ -2560,6 +2556,11 @@ void ext3_read_inode(struct inode * inod } else ei->i_extra_isize = 0; @@ -69,7 +69,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c if (S_ISREG(inode->i_mode)) { inode->i_op = &ext3_file_inode_operations; inode->i_fop = &ext3_file_operations; -@@ -2637,9 +2638,12 @@ static int ext3_do_update_inode(handle_t +@@ -2640,9 +2641,12 @@ static int ext3_do_update_inode(handle_t } raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le32(ei->i_disksize); @@ -85,11 +85,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c raw_inode->i_blocks = cpu_to_le32(inode->i_blocks); raw_inode->i_dtime = cpu_to_le32(ei->i_dtime); raw_inode->i_flags = cpu_to_le32(ei->i_flags); -Index: linux-2.6.16.27-0.9/fs/ext3/ioctl.c +Index: linux-2.6.16-sles10/fs/ext3/ioctl.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/ioctl.c -+++ linux-2.6.16.27-0.9/fs/ext3/ioctl.c -@@ -88,7 +88,7 @@ int ext3_ioctl (struct inode * inode, st +--- linux-2.6.16-sles10.orig/fs/ext3/ioctl.c ++++ linux-2.6.16-sles10/fs/ext3/ioctl.c +@@ -114,7 +114,7 @@ int ext3_ioctl (struct inode * inode, st ei->i_flags = flags; ext3_set_inode_flags(inode); @@ -98,7 +98,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/ioctl.c err = ext3_mark_iloc_dirty(handle, inode, &iloc); flags_err: -@@ -126,7 +126,7 @@ flags_err: +@@ -152,7 +152,7 @@ flags_err: return PTR_ERR(handle); err = ext3_reserve_inode_write(handle, inode, &iloc); if (err == 0) { @@ -107,11 +107,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/ioctl.c inode->i_generation = generation; err = ext3_mark_iloc_dirty(handle, inode, &iloc); } -Index: linux-2.6.16.27-0.9/fs/ext3/namei.c +Index: linux-2.6.16-sles10/fs/ext3/namei.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/namei.c -+++ linux-2.6.16.27-0.9/fs/ext3/namei.c -@@ -1276,7 +1276,7 @@ static int add_dirent_to_buf(handle_t *h +--- linux-2.6.16-sles10.orig/fs/ext3/namei.c ++++ linux-2.6.16-sles10/fs/ext3/namei.c +@@ -1296,7 +1296,7 @@ static int add_dirent_to_buf(handle_t *h * happen is that the times are slightly out of date * and/or different from the directory change time. */ @@ -120,7 +120,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_update_dx_flag(dir); dir->i_version++; ext3_mark_inode_dirty(handle, dir); -@@ -2056,7 +2056,7 @@ static int ext3_rmdir (struct inode * di +@@ -2090,7 +2090,7 @@ static int ext3_rmdir (struct inode * di inode->i_version++; inode->i_nlink = 0; ext3_orphan_add(handle, inode); @@ -129,7 +129,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_mark_inode_dirty(handle, inode); ext3_dec_count(handle, dir); ext3_update_dx_flag(dir); -@@ -2106,13 +2106,13 @@ static int ext3_unlink(struct inode * di +@@ -2140,13 +2140,13 @@ static int ext3_unlink(struct inode * di retval = ext3_delete_entry(handle, dir, de, bh); if (retval) goto end_unlink; @@ -145,7 +145,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_mark_inode_dirty(handle, inode); retval = 0; -@@ -2214,7 +2214,7 @@ retry: +@@ -2248,7 +2248,7 @@ retry: if (IS_DIRSYNC(dir)) handle->h_sync = 1; @@ -154,7 +154,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_inc_count(handle, inode); atomic_inc(&inode->i_count); -@@ -2317,7 +2317,7 @@ static int ext3_rename (struct inode * o +@@ -2351,7 +2351,7 @@ static int ext3_rename (struct inode * o * Like most other Unix systems, set the ctime for inodes on a * rename. */ @@ -163,7 +163,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_mark_inode_dirty(handle, old_inode); /* -@@ -2350,9 +2350,9 @@ static int ext3_rename (struct inode * o +@@ -2384,9 +2384,9 @@ static int ext3_rename (struct inode * o if (new_inode) { ext3_dec_count(handle, new_inode); @@ -175,11 +175,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c ext3_update_dx_flag(old_dir); if (dir_bh) { BUFFER_TRACE(dir_bh, "get_write_access"); -Index: linux-2.6.16.27-0.9/fs/ext3/super.c +Index: linux-2.6.16-sles10/fs/ext3/super.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/super.c -+++ linux-2.6.16.27-0.9/fs/ext3/super.c -@@ -1614,6 +1614,8 @@ static int ext3_fill_super (struct super +--- linux-2.6.16-sles10.orig/fs/ext3/super.c ++++ linux-2.6.16-sles10/fs/ext3/super.c +@@ -1709,6 +1709,8 @@ static int ext3_fill_super (struct super sbi->s_inode_size); goto failed_mount; } @@ -188,7 +188,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c } sbi->s_frag_size = EXT3_MIN_FRAG_SIZE << le32_to_cpu(es->s_log_frag_size); -@@ -1809,6 +1811,32 @@ static int ext3_fill_super (struct super +@@ -1904,6 +1906,32 @@ static int ext3_fill_super (struct super } ext3_setup_super (sb, es, sb->s_flags & MS_RDONLY); @@ -198,7 +198,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c + sbi->s_want_extra_isize = sizeof(struct ext3_inode) - + EXT3_GOOD_OLD_INODE_SIZE; + if (EXT3_HAS_RO_COMPAT_FEATURE(sb, -+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE)) { ++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)) { + if (sbi->s_want_extra_isize < + le16_to_cpu(es->s_want_extra_isize)) + sbi->s_want_extra_isize = @@ -221,26 +221,24 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c /* * akpm: core read_super() calls in here with the superblock locked. * That deadlocks, because orphan cleanup needs to lock the superblock -Index: linux-2.6.16.27-0.9/fs/ext3/xattr.c +Index: linux-2.6.16-sles10/fs/ext3/xattr.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/xattr.c -+++ linux-2.6.16.27-0.9/fs/ext3/xattr.c -@@ -1006,8 +1006,8 @@ ext3_xattr_set_handle(handle_t *handle, +--- linux-2.6.16-sles10.orig/fs/ext3/xattr.c ++++ linux-2.6.16-sles10/fs/ext3/xattr.c +@@ -1006,7 +1006,7 @@ ext3_xattr_set_handle(handle_t *handle, } if (!error) { ext3_xattr_update_super_block(handle, inode->i_sb); - inode->i_ctime = CURRENT_TIME_SEC; -- error = ext3_mark_iloc_dirty(handle, inode, &is.iloc); + inode->i_ctime = ext3_current_time(inode); -+ ext3_mark_inode_dirty(handle, inode); + error = ext3_mark_iloc_dirty(handle, inode, &is.iloc); /* * The bh is consumed by ext3_mark_iloc_dirty, even with - * error != 0. -Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h +Index: linux-2.6.16-sles10/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs.h -+++ linux-2.6.16.27-0.9/include/linux/ext3_fs.h -@@ -272,7 +272,7 @@ struct ext3_inode { +--- linux-2.6.16-sles10.orig/include/linux/ext3_fs.h ++++ linux-2.6.16-sles10/include/linux/ext3_fs.h +@@ -294,7 +294,7 @@ struct ext3_inode { __le16 i_uid; /* Low 16 bits of Owner Uid */ __le32 i_size; /* Size in bytes */ __le32 i_atime; /* Access time */ @@ -249,7 +247,7 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h __le32 i_mtime; /* Modification time */ __le32 i_dtime; /* Deletion Time */ __le16 i_gid; /* Low 16 bits of Group Id */ -@@ -321,10 +321,73 @@ struct ext3_inode { +@@ -343,10 +343,73 @@ struct ext3_inode { } osd2; /* OS dependent 2 */ __le16 i_extra_isize; __le16 i_pad1; @@ -323,35 +321,48 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h #if defined(__KERNEL__) || defined(__linux__) #define i_reserved1 osd1.linux1.l_i_reserved1 #define i_frag osd2.linux2.l_i_frag -@@ -508,7 +571,9 @@ struct ext3_super_block { - __u16 s_reserved_word_pad; +@@ -526,11 +589,19 @@ struct ext3_super_block { + __le32 s_last_orphan; /* start of list of inodes to delete */ + __le32 s_hash_seed[4]; /* HTREE hash seed */ + __u8 s_def_hash_version; /* Default hash version to use */ +- __u8 s_reserved_char_pad; +- __u16 s_reserved_word_pad; ++ __u8 s_jnl_backup_type; /* Default type of journal backup */ ++ __le16 s_desc_size; /* Group desc. size: INCOMPAT_64BIT */ __le32 s_default_mount_opts; - __le32 s_first_meta_bg; /* First metablock block group */ +- __le32 s_first_meta_bg; /* First metablock block group */ - __u32 s_reserved[190]; /* Padding to the end of the block */ ++ __le32 s_first_meta_bg; /* First metablock block group */ ++ __le32 s_mkfs_time; /* When the filesystem was created */ ++ __le32 s_jnl_blocks[17]; /* Backup of the journal inode */ ++ __le32 s_blocks_count_hi; /* Blocks count high 32 bits */ ++ __le32 s_r_blocks_count_hi; /* Reserved blocks count high 32 bits*/ ++ __le32 s_free_blocks_hi; /* Free blocks count high 32 bits */ + __le16 s_min_extra_isize; /* All inodes have at least # bytes */ + __le16 s_want_extra_isize; /* New inodes should reserve # bytes */ -+ __u32 s_reserved[189]; /* Padding to the end of the block */ ++ __le32 s_flags; /* Miscellaneous flags */ ++ __u32 s_reserved[167]; /* Padding to the end of the block */ }; #ifdef __KERNEL__ -@@ -583,6 +648,8 @@ static inline struct ext3_inode_info *EX - #define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +@@ -615,6 +686,8 @@ static inline int ext3_valid_inum(struct #define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 - #define EXT3_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 -+#define EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 + #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 + #define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020 ++#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE 0x0040 + #define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001 #define EXT3_FEATURE_INCOMPAT_FILETYPE 0x0002 -@@ -599,6 +666,7 @@ static inline struct ext3_inode_info *EX - #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \ +@@ -632,6 +705,7 @@ static inline int ext3_valid_inum(struct EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \ - EXT3_FEATURE_RO_COMPAT_DIR_NLINK| \ -+ EXT3_FEATURE_RO_COMPAT_EXTRA_ISIZE| \ + EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \ + EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \ ++ EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| \ EXT3_FEATURE_RO_COMPAT_BTREE_DIR) /* -@@ -726,6 +794,12 @@ static inline struct ext3_inode *ext3_ra +@@ -759,6 +833,12 @@ static inline struct ext3_inode *ext3_ra return (struct ext3_inode *) (iloc->bh->b_data + iloc->offset); } @@ -364,28 +375,28 @@ Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h /* * This structure is stuffed into the struct file's private_data field * for directories. It is where we put information so that we can do -Index: linux-2.6.16.27-0.9/include/linux/ext3_fs_i.h +Index: linux-2.6.16-sles10/include/linux/ext3_fs_i.h =================================================================== ---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs_i.h -+++ linux-2.6.16.27-0.9/include/linux/ext3_fs_i.h -@@ -135,6 +135,7 @@ struct ext3_inode_info { - struct inode vfs_inode; +--- linux-2.6.16-sles10.orig/include/linux/ext3_fs_i.h ++++ linux-2.6.16-sles10/include/linux/ext3_fs_i.h +@@ -120,6 +120,7 @@ struct ext3_inode_info { - __u32 i_cached_extent[4]; + /* on-disk additional length */ + __u16 i_extra_isize; + struct timespec i_crtime; - void *i_filterdata; - }; -Index: linux-2.6.16.27-0.9/include/linux/ext3_fs_sb.h + /* + * truncate_sem is for serialising ext3_truncate() against +Index: linux-2.6.16-sles10/include/linux/ext3_fs_sb.h =================================================================== ---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs_sb.h -+++ linux-2.6.16.27-0.9/include/linux/ext3_fs_sb.h -@@ -119,6 +119,8 @@ struct ext3_sb_info { - spinlock_t s_bal_lock; - unsigned long s_mb_buddies_generated; - unsigned long long s_mb_generation_time; -+ -+ unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */ - }; +--- linux-2.6.16-sles10.orig/include/linux/ext3_fs_sb.h ++++ linux-2.6.16-sles10/include/linux/ext3_fs_sb.h +@@ -68,6 +68,8 @@ struct ext3_sb_info { + /* Last group used to allocate inode */ + int s_last_alloc_group; - #define EXT3_GROUP_INFO(sb, group) \ ++ unsigned int s_want_extra_isize; /* New inodes should reserve # bytes */ ++ + /* root of the per fs reservation window tree */ + spinlock_t s_rsv_window_lock; + struct rb_root s_rsv_window_root;