Index: linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.h
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.h 2009-06-02 18:39:19.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.h 2009-06-04 17:01:43.000000000 +0530
@@ -35,6 +35,9 @@
(EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS) \
|| test_opt(sb, EXTENTS) ? 27U : 8U)
* and the superblock, which are already accounted for. */
Index: linux-2.6.27.21-0.1/fs/ext4/extents.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/extents.c
-+++ linux-2.6.27.21-0.1/fs/ext4/extents.c
+--- linux-2.6.27.21-0.1.orig/fs/ext4/extents.c 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/extents.c 2009-06-04 17:01:48.000000000 +0530
@@ -48,7 +48,7 @@
* ext_pblock:
* combine low and high parts of physical block number into ext4_fsblk_t
{
ext4_fsblk_t block;
-@@ -58,6 +58,17 @@ static ext4_fsblk_t ext_pblock(struct ex
+@@ -58,6 +58,17 @@
}
/*
* idx_pblock:
* combine low and high parts of a leaf physical block number into ext4_fsblk_t
*/
-@@ -71,17 +82,6 @@ ext4_fsblk_t idx_pblock(struct ext4_exte
+@@ -71,17 +82,6 @@
}
/*
* ext4_idx_store_pblock:
* stores a large physical block number into an index struct,
* breaking it into parts
-@@ -1851,6 +1851,56 @@ static int ext4_ext_rm_idx(handle_t *han
+@@ -1851,6 +1851,56 @@
}
/*
* ext4_ext_calc_credits_for_single_extent:
* This routine returns max. credits that needed to insert an extent
* to the extent tree.
-@@ -3170,3 +3220,14 @@ int ext4_fiemap(struct inode *inode, str
+@@ -3170,3 +3220,14 @@
return error;
}
+
Index: linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_extents.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_extents.h 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h 2009-06-04 17:01:48.000000000 +0530
@@ -59,6 +59,11 @@
*/
#define EXT_STATS_
/*
* ext4_inode has i_block array (60 bytes total).
-@@ -124,6 +129,7 @@ struct ext4_ext_path {
+@@ -124,6 +129,7 @@
#define EXT4_EXT_CACHE_GAP 1
#define EXT4_EXT_CACHE_EXTENT 2
#define EXT_MAX_BLOCK 0xffffffff
-@@ -223,10 +229,14 @@ static inline int ext4_ext_get_actual_le
+@@ -223,10 +229,14 @@
(le16_to_cpu(ext->ee_len) - EXT_INIT_MAX_LEN));
}
struct ext4_ext_path *path);
Index: linux-2.6.27.21-0.1/fs/ext4/mballoc.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/mballoc.c
-+++ linux-2.6.27.21-0.1/fs/ext4/mballoc.c
-@@ -4348,6 +4348,13 @@ repeat:
+--- linux-2.6.27.21-0.1.orig/fs/ext4/mballoc.c 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/mballoc.c 2009-06-04 17:01:43.000000000 +0530
+@@ -4354,6 +4354,13 @@
kmem_cache_free(ext4_ac_cachep, ac);
}
/*
* finds all preallocated spaces and return blocks being freed to them
* if preallocated space becomes full (no block is used from the space)
-@@ -5170,3 +5177,6 @@ error_return:
+@@ -5176,3 +5183,6 @@
kmem_cache_free(ext4_ac_cachep, ac);
return;
}
+
Index: linux-2.6.27.21-0.1/fs/ext4/super.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/super.c
-+++ linux-2.6.27.21-0.1/fs/ext4/super.c
-@@ -91,6 +91,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su
+--- linux-2.6.27.21-0.1.orig/fs/ext4/super.c 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/super.c 2009-06-04 17:01:46.000000000 +0530
+@@ -91,6 +91,7 @@
(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 ext4_inode_table(struct super_block *sb,
struct ext4_group_desc *bg)
-@@ -1295,6 +1296,7 @@ enum {
+@@ -1295,6 +1296,7 @@
Opt_stripe, Opt_delalloc, Opt_nodelalloc,
Opt_inode_readahead_blks, Opt_bigendian_extents,
Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
};
static const match_table_t tokens = {
-@@ -1356,6 +1358,7 @@ static const match_table_t tokens = {
+@@ -1356,6 +1358,7 @@
{Opt_nodelalloc, "nodelalloc"},
{Opt_inode_readahead_blks, "inode_readahead_blks=%u"},
{Opt_bigendian_extents, "bigendian_extents"},
{Opt_err, NULL},
};
-@@ -1774,6 +1777,8 @@ set_qf_format:
+@@ -1774,6 +1777,8 @@
case Opt_bigendian_extents:
bigendian_extents = 1;
break;
default:
printk(KERN_ERR
"EXT4-fs: Unrecognized mount option \"%s\" "
-@@ -4095,7 +4100,7 @@ static struct file_system_type ext4dev_f
+@@ -4094,7 +4099,7 @@
.kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV,
};
{
Index: linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.c
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.c
-@@ -21,6 +21,7 @@ int __ext4_journal_get_write_access(cons
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.c 2009-06-02 18:39:19.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.c 2009-06-04 17:01:43.000000000 +0530
+@@ -21,6 +21,7 @@
ext4_journal_abort_handle(where, __func__, bh, handle, err);
return err;
}
int __ext4_journal_forget(const char *where, handle_t *handle,
struct buffer_head *bh)
-@@ -57,3 +58,4 @@ int __ext4_journal_dirty_metadata(const
+@@ -57,3 +58,4 @@
ext4_journal_abort_handle(where, __func__, bh, handle, err);
return err;
}
+EXPORT_SYMBOL(__ext4_journal_dirty_metadata);
Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ext4.h 2009-06-04 17:02:07.000000000 +0530
@@ -26,6 +26,9 @@
* The fourth extended filesystem constants/structures
*/
/*
* Define EXT4FS_DEBUG to produce debug messages
*/
-@@ -1116,6 +1119,8 @@ extern void ext4_mb_update_group_info(st
+@@ -400,6 +403,8 @@
+ __le32 i_version_hi; /* high 32 bits for 64-bit version */
+ };
+
++/* SLES11 kernel already has 64-bit inode->i_version field */
++#define HAVE_DISK_INODE_VERSION
+
+ #define EXT4_EPOCH_BITS 2
+ #define EXT4_EPOCH_MASK ((1 << EXT4_EPOCH_BITS) - 1)
+@@ -1115,6 +1120,8 @@
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);
struct buffer_head *bh, ext4_fsblk_t blocknr);
Index: linux-2.6.27.21-0.1/fs/ext4/inode.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/inode.c
-+++ linux-2.6.27.21-0.1/fs/ext4/inode.c
-@@ -4240,6 +4240,7 @@ bad_inode:
+--- linux-2.6.27.21-0.1.orig/fs/ext4/inode.c 2009-06-04 17:01:43.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/inode.c 2009-06-04 17:01:43.000000000 +0530
+@@ -4240,6 +4240,7 @@
iget_failed(inode);
return ERR_PTR(ret);
}
Index: linux-2.6.27.21-0.1/fs/ext4/ialloc.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ialloc.c
-+++ linux-2.6.27.21-0.1/fs/ext4/ialloc.c
-@@ -675,7 +675,8 @@ err_ret:
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ialloc.c 2009-06-02 18:39:22.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ialloc.c 2009-06-04 17:01:26.000000000 +0530
+@@ -675,7 +675,8 @@
* For other inodes, search forward from the parent directory's block
* group to find a free inode.
*/
{
struct super_block *sb;
struct buffer_head *inode_bitmap_bh = NULL;
-@@ -706,6 +707,43 @@ struct inode *ext4_new_inode(handle_t *h
+@@ -706,6 +707,48 @@
sbi = EXT4_SB(sb);
es = sbi->s_es;
+ /* We've shortcircuited the allocation system successfully,
+ * now finish filling in the inode.
+ */
++ BUFFER_TRACE(group_desc_bh, "get_write_access");
++ err = ext4_journal_get_write_access(handle, group_desc_bh);
++ if (err)
++ goto fail;
++
+ goto got;
+ }
+
goto got_group;
Index: linux-2.6.27.21-0.1/fs/ext4/namei.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/namei.c
-+++ linux-2.6.27.21-0.1/fs/ext4/namei.c
-@@ -104,6 +104,7 @@ struct dx_entry
+--- linux-2.6.27.21-0.1.orig/fs/ext4/namei.c 2009-06-02 18:39:22.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/namei.c 2009-06-04 17:00:38.000000000 +0530
+@@ -104,6 +104,7 @@
__le32 block;
};
/*
* dx_root_info is laid out so that if it should somehow get overlaid by a
* dirent the two low bits of the hash version will be zero. Therefore, the
-@@ -149,6 +150,14 @@ struct dx_map_entry
+@@ -149,6 +150,14 @@
u16 size;
};
static inline ext4_lblk_t dx_get_block(struct dx_entry *entry);
static void dx_set_block(struct dx_entry *entry, ext4_lblk_t value);
static inline unsigned dx_get_hash(struct dx_entry *entry);
-@@ -1716,6 +1725,20 @@ static int ext4_add_nondir(handle_t *han
+@@ -1716,6 +1725,20 @@
return err;
}
/*
* By the time this is called, we already have created
* the directory cache entry for the new file, but it
-@@ -1741,7 +1764,7 @@ retry:
+@@ -1741,7 +1764,7 @@
if (IS_DIRSYNC(dir))
handle->h_sync = 1;
err = PTR_ERR(inode);
if (!IS_ERR(inode)) {
inode->i_op = &ext4_file_inode_operations;
-@@ -1775,7 +1798,7 @@ retry:
+@@ -1775,7 +1798,7 @@
if (IS_DIRSYNC(dir))
handle->h_sync = 1;
err = PTR_ERR(inode);
if (!IS_ERR(inode)) {
init_special_inode(inode, inode->i_mode, rdev);
-@@ -1811,7 +1834,7 @@ retry:
+@@ -1811,7 +1834,7 @@
if (IS_DIRSYNC(dir))
handle->h_sync = 1;
err = PTR_ERR(inode);
if (IS_ERR(inode))
goto out_stop;
-@@ -2211,7 +2234,7 @@ retry:
+@@ -2211,7 +2234,7 @@
if (IS_DIRSYNC(dir))
handle->h_sync = 1;
goto out_stop;
Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h
-+++ linux-2.6.27.21-0.1/fs/ext4/ext4.h
-@@ -1032,7 +1032,8 @@ extern int ext4fs_dirhash(const char *na
+--- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h 2009-06-02 18:39:22.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/ext4.h 2009-06-04 17:00:38.000000000 +0530
+@@ -1032,7 +1032,8 @@
dx_hash_info *hinfo);
/* ialloc.c */
extern unsigned long ext4_count_free_inodes(struct super_block *);
Index: linux-2.6.27.21-0.1/fs/ext4/migrate.c
===================================================================
---- linux-2.6.27.21-0.1.orig/fs/ext4/migrate.c
-+++ linux-2.6.27.21-0.1/fs/ext4/migrate.c
-@@ -484,7 +484,7 @@ int ext4_ext_migrate(struct inode *inode
+--- linux-2.6.27.21-0.1.orig/fs/ext4/migrate.c 2009-06-02 18:39:22.000000000 +0530
++++ linux-2.6.27.21-0.1/fs/ext4/migrate.c 2009-06-04 17:00:38.000000000 +0530
+@@ -484,7 +484,7 @@
}
tmp_inode = ext4_new_inode(handle,
inode->i_sb->s_root->d_inode,