X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Frhel6.6%2Fext4-inode_info_reorganize.patch;fp=ldiskfs%2Fkernel_patches%2Fpatches%2Frhel6.6%2Fext4-inode_info_reorganize.patch;h=0000000000000000000000000000000000000000;hp=1a312092e4a31db3c9aa66043edcd1c48599835c;hb=501a46de3bd3681c322379a10416f75b759268f7;hpb=84fa16eda4aff8ebf2a557aeebe3401589c8a10e

diff --git a/ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch b/ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch
deleted file mode 100644
index 1a31209..0000000
--- a/ldiskfs/kernel_patches/patches/rhel6.6/ext4-inode_info_reorganize.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: linux-stage/fs/ext4/ext4.h
-===================================================================
---- linux-stage.orig/fs/ext4/ext4.h	2012-08-07 14:16:06.331203480 -0700
-+++ linux-stage/fs/ext4/ext4.h	2012-08-10 10:08:47.854206335 -0700
-@@ -713,6 +713,7 @@
- 	/* following fields for parallel directory operations -bzzz */
- 	struct semaphore i_append_sem;
- 
-+	ext4_lblk_t		i_dir_start_lookup;
- 	/*
- 	 * i_block_group is the number of the block group which contains
- 	 * this file's inode.  Constant across the lifetime of the inode,
-@@ -724,7 +725,6 @@
- 	unsigned long	i_state_flags;		/* Dynamic state flags */
- 	unsigned long	i_flags;
- 
--	ext4_lblk_t		i_dir_start_lookup;
- #ifdef CONFIG_EXT4_FS_XATTR
- 	/*
- 	 * Extended attributes can be read independently of the main file
-@@ -788,10 +788,12 @@
- 	unsigned int i_reserved_data_blocks;
- 	unsigned int i_reserved_meta_blocks;
- 	unsigned int i_allocated_meta_blocks;
--	unsigned short i_delalloc_reserved_flag;
- 	sector_t i_da_metadata_calc_last_lblock;
- 	int i_da_metadata_calc_len;
- 
-+	/* allocation reservation info for delalloc */
-+	unsigned short i_delalloc_reserved_flag;
-+
- 	/* on-disk additional length */
- 	__u16 i_extra_isize;
- 
-@@ -807,16 +809,22 @@
- 	struct list_head i_aio_dio_complete_list;
- 	spinlock_t i_completed_io_lock;
- 	atomic_t i_unwritten; /* Number of inflight conversions pending */
--	struct mutex i_aio_mutex; /* big hammer for unaligned AIO */
- 
- 	/*
- 	 * Transactions that contain inode's metadata needed to complete
- 	 * fsync and fdatasync, respectively.
- 	 */
-+
- 	tid_t i_sync_tid;
--	tid_t i_datasync_tid;
-+
-+	struct mutex i_aio_mutex; /* big hammer for unaligned AIO */
- 
- 	__u64 i_fs_version;
-+	/*
-+	 * Transactions that contain inode's metadata needed to complete
-+	 * fsync and fdatasync, respectively.
-+	 */
-+	tid_t i_datasync_tid;
- };
- 
- #define HAVE_DISK_INODE_VERSION