X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fext4-misc-rhel5.patch;h=e77314e0b72d7d3abadf7bc8f79042770c9f5a41;hp=b8b55ae26f1c70e677cf95cc293a6a558484c520;hb=f364042c3329559ccdbfddd8b35e8289179ee1bc;hpb=898d16e4a9265be32af41bea56f96ddf6e83877d diff --git a/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch index b8b55ae..e77314e 100644 --- a/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/ext4-misc-rhel5.patch @@ -1,24 +1,21 @@ -Index: linux-2.6.18.i386/fs/ext4/ext4_jbd2.h +Index: linux-stage/fs/ext4/ext4_jbd2.h =================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/ext4_jbd2.h -+++ linux-2.6.18.i386/fs/ext4/ext4_jbd2.h -@@ -35,6 +35,11 @@ - (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS) \ - || test_opt(sb, EXTENTS) ? 27U : 8U) +--- linux-stage.orig/fs/ext4/ext4_jbd2.h ++++ linux-stage/fs/ext4/ext4_jbd2.h +@@ -35,6 +35,8 @@ + (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS) \ + ? 27U : 8U) -+/* Indicate that EXT4_SINGLEDATA_TRANS_BLOCKS takes the sb as argument */ -+#define EXT4_SINGLEDATA_TRANS_BLOCKS_HAS_SB -+ +#define ext4_journal_dirty_metadata(handle, bh) \ + ext4_handle_dirty_metadata(handle, NULL, bh) /* Extended attribute operations touch at most two data buffers, * two bitmap buffers, and two group summaries, in addition to the inode * and the superblock, which are already accounted for. */ -Index: linux-2.6.18.i386/fs/ext4/extents.c +Index: linux-stage/fs/ext4/extents.c =================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/extents.c -+++ linux-2.6.18.i386/fs/ext4/extents.c -@@ -60,6 +60,17 @@ static ext4_fsblk_t ext_pblock(struct ex +--- linux-stage.orig/fs/ext4/extents.c ++++ linux-stage/fs/ext4/extents.c +@@ -59,6 +59,17 @@ ext4_fsblk_t ext_pblock(struct ext4_exte } /* @@ -36,7 +33,7 @@ Index: linux-2.6.18.i386/fs/ext4/extents.c * idx_pblock: * combine low and high parts of a leaf physical block number into ext4_fsblk_t */ -@@ -73,17 +84,6 @@ ext4_fsblk_t idx_pblock(struct ext4_exte +@@ -72,17 +83,6 @@ ext4_fsblk_t idx_pblock(struct ext4_exte } /* @@ -54,7 +51,7 @@ Index: linux-2.6.18.i386/fs/ext4/extents.c * ext4_idx_store_pblock: * stores a large physical block number into an index struct, * breaking it into parts -@@ -1826,6 +1826,56 @@ static int ext4_ext_rm_idx(handle_t *han +@@ -2097,6 +2097,56 @@ static int ext4_ext_rm_idx(handle_t *han } /* @@ -111,11 +108,10 @@ Index: linux-2.6.18.i386/fs/ext4/extents.c * ext4_ext_calc_credits_for_single_extent: * This routine returns max. credits that needed to insert an extent * to the extent tree. -@@ -3157,4 +3207,14 @@ int ext4_fiemap(struct inode *inode, str - +@@ -3941,3 +3991,15 @@ int ext4_fiemap(struct inode *inode, str return error; } -+ + +EXPORT_SYMBOL(ext4_ext_store_pblock); +EXPORT_SYMBOL(ext4_ext_search_right); +EXPORT_SYMBOL(ext4_ext_search_left); @@ -125,12 +121,14 @@ Index: linux-2.6.18.i386/fs/ext4/extents.c +EXPORT_SYMBOL(ext4_ext_walk_space); +EXPORT_SYMBOL(ext4_ext_calc_credits_for_insert); +EXPORT_SYMBOL(ext4_mark_inode_dirty); - -Index: linux-2.6.18.i386/fs/ext4/ext4_extents.h ++EXPORT_SYMBOL(ext4_ext_find_extent); ++EXPORT_SYMBOL(ext4_ext_drop_refs); ++ +Index: linux-stage/fs/ext4/ext4_extents.h =================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/ext4_extents.h -+++ linux-2.6.18.i386/fs/ext4/ext4_extents.h -@@ -59,6 +59,12 @@ +--- linux-stage.orig/fs/ext4/ext4_extents.h ++++ linux-stage/fs/ext4/ext4_extents.h +@@ -58,6 +58,12 @@ */ #define EXT_STATS_ @@ -143,16 +141,7 @@ Index: linux-2.6.18.i386/fs/ext4/ext4_extents.h /* * ext4_inode has i_block array (60 bytes total). -@@ -124,6 +129,8 @@ struct ext4_ext_path { - #define EXT4_EXT_CACHE_GAP 1 - #define EXT4_EXT_CACHE_EXTENT 2 - -+#define EXT4_EXT_HAS_NO_TREE /* ext4_extents_tree struct is not used*/ -+#define EXT_INSERT_EXTENT_WITH_5ARGS - - #define EXT_MAX_BLOCK 0xffffffff - -@@ -228,6 +234,8 @@ static inline int ext4_ext_get_actual_le +@@ -231,6 +237,8 @@ extern ext4_fsblk_t ext_pblock(struct ex extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *); extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t); extern int ext4_extent_tree_init(handle_t *, struct inode *); @@ -161,53 +150,47 @@ Index: linux-2.6.18.i386/fs/ext4/ext4_extents.h extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode, int num, struct ext4_ext_path *path); -Index: linux-2.6.18.i386/fs/ext4/mballoc.c +Index: linux-stage/fs/ext4/mballoc.c =================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/mballoc.c -+++ linux-2.6.18.i386/fs/ext4/mballoc.c -@@ -4355,6 +4355,13 @@ +--- linux-stage.orig/fs/ext4/mballoc.c ++++ linux-stage/fs/ext4/mballoc.c +@@ -4313,6 +4313,7 @@ repeat: + if (ac) kmem_cache_free(ext4_ac_cachep, ac); } ++EXPORT_SYMBOL(ext4_discard_preallocations); -+/* For backward compatibility, since Lustre uses this symbol */ -+void ext4_mb_discard_inode_preallocations(struct inode *inode) -+{ -+ ext4_discard_preallocations(inode); -+} -+EXPORT_SYMBOL(ext4_mb_discard_inode_preallocations); -+ /* * finds all preallocated spaces and return blocks being freed to them - * if preallocated space becomes full (no block is used from the space) -@@ -4965,3 +4965,6 @@ error_return: +@@ -5127,3 +5128,6 @@ error_return: kmem_cache_free(ext4_ac_cachep, ac); return; } + +EXPORT_SYMBOL(ext4_free_blocks); + -Index: linux-2.6.18.i386/fs/ext4/ext4_jbd2.c +Index: linux-stage/fs/ext4/ext4_jbd2.c =================================================================== ---- linux-2.6.18.i386.orig/fs/ext4/ext4_jbd2.c -+++ linux-2.6.18.i386/fs/ext4/ext4_jbd2.c -@@ -21,6 +21,7 @@ int __ext4_journal_get_write_access(cons - ext4_journal_abort_handle(where, __func__, bh, handle, err); +--- linux-stage.orig/fs/ext4/ext4_jbd2.c ++++ linux-stage/fs/ext4/ext4_jbd2.c +@@ -31,6 +31,7 @@ int __ext4_journal_get_write_access(cons + } return err; } +EXPORT_SYMBOL(__ext4_journal_get_write_access); int __ext4_journal_forget(const char *where, handle_t *handle, struct buffer_head *bh) -@@ -57,3 +58,4 @@ int __ext4_journal_dirty_metadata(const - ext4_journal_abort_handle(where, __func__, bh, handle, err); +@@ -107,3 +108,4 @@ int __ext4_handle_dirty_metadata(const c + } return err; } +EXPORT_SYMBOL(__ext4_handle_dirty_metadata); -Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h +Index: linux-stage/fs/ext4/ext4.h =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h 2009-07-07 14:47:19.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h 2009-07-07 14:47:22.000000000 +0530 -@@ -1123,6 +1128,8 @@ +--- linux-stage.orig/fs/ext4/ext4.h ++++ linux-stage/fs/ext4/ext4.h +@@ -1528,6 +1528,8 @@ extern int ext4_mb_add_groupinfo(struct extern int ext4_mb_get_buddy_cache_lock(struct super_block *, ext4_group_t); extern void ext4_mb_put_buddy_cache_lock(struct super_block *, ext4_group_t, int); @@ -216,11 +199,11 @@ Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h /* inode.c */ int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode, struct buffer_head *bh, ext4_fsblk_t blocknr); -Index: linux-2.6.27.21-0.1/fs/ext4/inode.c +Index: linux-stage/fs/ext4/inode.c =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/inode.c 2009-07-07 14:47:19.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/inode.c 2009-07-07 14:47:22.000000000 +0530 -@@ -4240,6 +4240,7 @@ +--- linux-stage.orig/fs/ext4/inode.c ++++ linux-stage/fs/ext4/inode.c +@@ -5078,6 +5078,7 @@ bad_inode: iget_failed(inode); return ERR_PTR(ret); } @@ -228,109 +211,120 @@ Index: linux-2.6.27.21-0.1/fs/ext4/inode.c static int ext4_inode_blocks_set(handle_t *handle, struct ext4_inode *raw_inode, -Index: linux-2.6.27.21-0.1/fs/ext4/super.c +Index: linux-stage/fs/ext4/super.c =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/super.c 2009-07-07 14:47:19.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/super.c 2009-07-07 14:48:53.000000000 +0530 -@@ -91,6 +91,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su +--- linux-stage.orig/fs/ext4/super.c ++++ linux-stage/fs/ext4/super.c +@@ -90,6 +90,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? - (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0); + (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0); } +EXPORT_SYMBOL(ext4_inode_bitmap); ext4_fsblk_t ext4_inode_table(struct super_block *sb, struct ext4_group_desc *bg) -@@ -113,6 +118,7 @@ - (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? - (__u32)le16_to_cpu(bg->bg_itable_unused_hi) << 16 : 0); +@@ -114,6 +115,7 @@ __u32 ext4_free_inodes_count(struct supe + (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ? + (__u32)le16_to_cpu(bg->bg_free_inodes_count_hi) << 16 : 0); } +EXPORT_SYMBOL(ext4_itable_unused_count); - - void ext4_block_bitmap_set(struct super_block *sb, - struct ext4_group_desc *bg, ext4_fsblk_t blk) -@@ -1286,6 +1287,7 @@ - Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, - Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, Opt_resize, - Opt_usrquota, Opt_grpquota, Opt_i_version, + + __u32 ext4_used_dirs_count(struct super_block *sb, + struct ext4_group_desc *bg) +@@ -1489,9 +1491,11 @@ enum { + Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, + Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, Opt_resize, + Opt_usrquota, Opt_grpquota, Opt_i_version, + Opt_mballoc, Opt_extents, - Opt_stripe, Opt_delalloc, Opt_nodelalloc, - Opt_inode_readahead_blks, Opt_journal_ioprio, - Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, Opt_bigendian_extents, -@@ -1346,6 +1348,8 @@ - {Opt_barrier, "barrier"}, - {Opt_nobarrier, "nobarrier"}, - {Opt_i_version, "i_version"}, + Opt_stripe, Opt_delalloc, Opt_nodelalloc, + Opt_block_validity, Opt_noblock_validity, +- Opt_inode_readahead_blks, Opt_journal_ioprio ++ Opt_inode_readahead_blks, Opt_journal_ioprio, ++ Opt_iopen, Opt_noiopen, Opt_iopen_nopriv, + }; + + static match_table_t tokens = { +@@ -1547,6 +1551,11 @@ static match_table_t tokens = { + {Opt_barrier, "barrier"}, + {Opt_nobarrier, "nobarrier"}, + {Opt_i_version, "i_version"}, + {Opt_mballoc, "mballoc"}, + {Opt_extents, "extents"}, - {Opt_stripe, "stripe=%u"}, - {Opt_resize, "resize"}, - {Opt_delalloc, "delalloc"}, -@@ -1768,6 +1771,9 @@ - case Opt_bigendian_extents: - bigendian_extents = 1; ++ {Opt_iopen, "iopen"}, ++ {Opt_noiopen, "noiopen"}, ++ {Opt_iopen_nopriv, "iopen_nopriv"}, + {Opt_stripe, "stripe=%u"}, + {Opt_resize, "resize"}, + {Opt_delalloc, "delalloc"}, +@@ -1993,6 +2002,12 @@ set_qf_format: + else + set_opt(sbi->s_mount_opt,NO_AUTO_DA_ALLOC); break; + case Opt_mballoc: + case Opt_extents: ++ case Opt_iopen: ++ case Opt_noiopen: ++ case Opt_iopen_nopriv: + break; default: - printk(KERN_ERR - "EXT4-fs: Unrecognized mount option \"%s\" " -@@ -2768,7 +2771,7 @@ - char *buf) + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" " +@@ -2543,7 +2558,7 @@ static ssize_t delayed_allocation_blocks + char *buf) { - return snprintf(buf, PAGE_SIZE, "%llu\n", + return snprintf(buf, PAGE_SIZE, "%llu\n", - (s64) percpu_counter_sum(&sbi->s_dirtyblocks_counter)); + (unsigned long long) percpu_counter_sum(&sbi->s_dirtyblocks_counter)); } static ssize_t session_write_kbytes_show(struct ext4_attr *a, -@@ -2868,11 +2871,11 @@ - struct super_block *sb = sbi->s_buddy_cache->i_sb; - - return snprintf(buf, PAGE_SIZE, "%llu\n", +@@ -2564,11 +2579,11 @@ static ssize_t lifetime_write_kbytes_sho + struct super_block *sb = sbi->s_buddy_cache->i_sb; + + return snprintf(buf, PAGE_SIZE, "%llu\n", - sbi->s_kbytes_written + + (unsigned long long)(sbi->s_kbytes_written + - (sb->s_bdev->bd_part ? - (part_stat_read(sb->s_bdev->bd_part, sectors[1]) - - EXT4_SB(sb)->s_sectors_written_start) >> 1 + (sb->s_bdev->bd_part ? + (part_stat_read(sb->s_bdev->bd_part, sectors[1]) - + EXT4_SB(sb)->s_sectors_written_start) >> 1 - : 0)); + : 0))); } static ssize_t inode_readahead_blks_store(struct ext4_attr *a, -@@ -3868,7 +3871,7 @@ - if (blocks_count && ext4_blocks_count(es) > blocks_count) { - ext4_msg(sb, KERN_WARNING, "bad geometry: block count %llu " - "exceeds size of device (%llu blocks)", +@@ -3042,7 +3057,7 @@ static int ext4_fill_super(struct super_ + if (blocks_count && ext4_blocks_count(es) > blocks_count) { + ext4_msg(sb, KERN_WARNING, "bad geometry: block count %llu " + "exceeds size of device (%llu blocks)", - ext4_blocks_count(es), blocks_count); + ext4_blocks_count(es), (unsigned long long)blocks_count); - goto failed_mount; - } - -Index: linux-2.6.27.21-0.1/fs/ext4/fsync.c + goto failed_mount; + } + +Index: linux-stage/fs/ext4/fsync.c =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/fsync.c 2009-07-07 14:47:19.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/fsync.c 2009-07-07 14:48:53.000000000 +0530 -@@ -1768,7 +1771,7 @@ +--- linux-stage.orig/fs/ext4/fsync.c ++++ linux-stage/fs/ext4/fsync.c +@@ -61,7 +61,7 @@ int ext4_sync_file(struct file *file, st - trace_mark(ext4_sync_file, "dev %s datasync %d ino %ld parent %ld", - inode->i_sb->s_id, datasync, inode->i_ino, + trace_mark(ext4_sync_file, "dev %s datasync %d ino %ld parent %ld", + inode->i_sb->s_id, datasync, inode->i_ino, - dentry->d_parent->d_inode->i_ino); + 0L); - - /* - * data=writeback: -Index: linux-2.6.27.21-0.1/fs/ext4/move_extent.c + + ret = flush_aio_dio_completed_IO(inode); + if (ret < 0) +Index: linux-stage/fs/ext4/move_extent.c =================================================================== ---- linux-2.6.27.21-0.1.orig/fs/ext4/move_extent.c 2009-07-07 14:47:19.000000000 +0530 -+++ linux-2.6.27.21-0.1/fs/ext4/move_extent.c 2009-07-07 14:48:53.000000000 +0530 -@@ -1768,7 +1771,8 @@ - ext4_error(orig_inode->i_sb, __func__, - "We replaced blocks too much! " - "sum of replaced: %llu requested: %llu", +--- linux-stage.orig/fs/ext4/move_extent.c ++++ linux-stage/fs/ext4/move_extent.c +@@ -1358,7 +1358,8 @@ ext4_move_extents(struct file *o_filp, s + ext4_error(orig_inode->i_sb, + "We replaced blocks too much! " + "sum of replaced: %llu requested: %llu", - *moved_len, len); + (unsigned long long)(*moved_len), + (unsigned long long)(len)); - ret1 = -EIO; - goto out; - } + ret1 = -EIO; + break; + }