ext4 kernel patches against linux-2.6.18-rc7-mm1

ext4 kernel patches against linux-2.6.18-rc7-mm1

[Dave Kleikamp]

I have ported the ext4 kernel patches to linux-2.6.18-rc7-mm1.  They
have been compile-tested, but I haven't done any run-time testing yet.

I expect that the rc7-mm1 ext3 that these patches are based off will be
close to 2.6.19-rc1, which is the target for merging ext4 into the
mainline tree.

The patches can be found here:
ftp://kernel.org/pub/linux/kernel/people/shaggy/ext4

Here's the series file:

# These patches were build against linux-2.6.18-rc7-mm1
#
# These first 3 patches create a clone of ext3 into ext4
ext4-copy.patch
ext4-rename.patch
ext4-enable.patch
#
# These next 4 copy clone jdb2 from jbd and modify ext4 to use it
jbd2-copy.patch
jbd2-rename.patch
jbd2-enable.patch
# ext4_jbd.h is no longer used
jbd2-cleanup.patch
#
# Shaggy made some minor changes to fix whitespace, sparse errors, etc.
# in many of the following patches
#
# From Alex Tomas
ext4-extents.patch
#
# From Mingming Cao
ext4_fsblk_sector_t.patch
#
# From Alex Tomas
ext4-extents-48bit.patch
#
# From Suparna Bhattacharya
ext4-unitialized-extent-handling.patch
#
# From Randy Dunlap
extents_comment_fix.patch
#
# From Zach Brown and Badari Pulavarty
64bit_jbd2_core.patch
#
# From Mingming Cao
sector_t-jbd2.patch
#
# From Badari Pulavarty
ext4_48bit_i_file_acl.patch
#
# From Laurent Vivier
64bit-metadata.patch
#
# From Avantika Mathur
64bitmetadata_inline_funcs_fix.patch
#
# From Mingming Cao
ext4_blk_type_from_sector_t_to_ulonglong.patch
ext4_remove_sector_t_bits_check.patch
jbd2_blks_type_from_sector_t_to_ull.patch
#
# From Alexandre Ratchov
ext4_remove_relative_block_numbers.patch
ext4_allow_larger_descriptor_size.patch
ext4_move_block_number_hi_bits.patch
-- 
David Kleikamp
IBM Linux Technology Center

Re: ext4 kernel patches against linux-2.6.18-rc7-mm1

[Eric Sandeen]

Dave Kleikamp wrote:

> # From Mingming Cao
> sector_t-jbd2.patch

I think this one needs to address the first, last variables in
journal_fail_superblock():

 static int journal_reset(journal_t *journal)
 {
        journal_superblock_t *sb = journal->j_superblock;
-       unsigned int first, last;
+       sector_t first, last;

        first = be32_to_cpu(sb->s_first);
        last = be32_to_cpu(sb->s_maxlen);

(and then later change that back to unsigned long long, in the spirit of
the patch series)

-Eric

Re: ext4 kernel patches against linux-2.6.18-rc7-mm1

[Eric Sandeen]

Eric Sandeen wrote:
> Dave Kleikamp wrote:
> 
>> # From Mingming Cao
>> sector_t-jbd2.patch
> 
> I think this one needs to address the first, last variables in
> journal_fail_superblock():
> 
>  static int journal_reset(journal_t *journal)
>  {
>         journal_superblock_t *sb = journal->j_superblock;
> -       unsigned int first, last;
> +       sector_t first, last;
> 
>         first = be32_to_cpu(sb->s_first);
>         last = be32_to_cpu(sb->s_maxlen);
> 
> (and then later change that back to unsigned long long, in the spirit of
> the patch series)

Hm, and looking further, I think this change:

 journal_t * jbd2_journal_init_dev(struct block_device *bdev,
                        struct block_device *fs_dev,
-                       int start, int len, int blocksize)
+                       sector_t start, int len, int blocksize)

is unnecessary; this is initializing the journal on an external device,
and start is in the first few blocks of the disk:

        sb_block = EXT3_MIN_BLOCK_SIZE / blocksize;
        start = sb_block + 1;

and len is also constrained by the maximum log size.

-Eric

Re: ext4 kernel patches against linux-2.6.18-rc7-mm1

[Johann Lombardi]

On Wed, Sep 20, 2006 at 10:56:39AM -0500, Dave Kleikamp wrote:
> # These next 4 copy clone jdb2 from jbd and modify ext4 to use it
> jbd2-copy.patch
> jbd2-rename.patch

jbd and jbd2 currently use the same slab names which must be unique.
The patch below just renames jbd2's slabs.

Signed-off-by: Johann Lombardi <johann.lombardi@bull.net>

Index: linux-2.6.18-rc7-mm1/fs/jbd2/journal.c
===================================================================
--- linux-2.6.18-rc7-mm1.orig/fs/jbd2/journal.c	2006-09-21 16:37:49.566959224 +0200
+++ linux-2.6.18-rc7-mm1/fs/jbd2/journal.c	2006-09-21 16:38:19.145462608 +0200
@@ -1643,7 +1643,7 @@
 
 static kmem_cache_t *jbd_slab[JBD_MAX_SLABS];
 static const char *jbd_slab_names[JBD_MAX_SLABS] = {
-	"jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k"
+	"jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
 };
 
 static void jbd2_journal_destroy_jbd_slabs(void)
@@ -1714,7 +1714,7 @@
 	int retval;
 
 	J_ASSERT(jbd2_journal_head_cache == 0);
-	jbd2_journal_head_cache = kmem_cache_create("journal_head",
+	jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head",
 				sizeof(struct journal_head),
 				0,		/* offset */
 				0,		/* flags */
@@ -2019,7 +2019,7 @@
 
 static int __init journal_init_handle_cache(void)
 {
-	jbd2_handle_cache = kmem_cache_create("journal_handle",
+	jbd2_handle_cache = kmem_cache_create("jbd2_journal_handle",
 				sizeof(handle_t),
 				0,		/* offset */
 				0,		/* flags */
Index: linux-2.6.18-rc7-mm1/fs/jbd2/revoke.c
===================================================================
--- linux-2.6.18-rc7-mm1.orig/fs/jbd2/revoke.c	2006-09-21 16:38:28.044109808 +0200
+++ linux-2.6.18-rc7-mm1/fs/jbd2/revoke.c	2006-09-21 16:38:40.978143536 +0200
@@ -169,13 +169,13 @@
 
 int __init jbd2_journal_init_revoke_caches(void)
 {
-	jbd2_revoke_record_cache = kmem_cache_create("revoke_record",
+	jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
 					   sizeof(struct jbd2_revoke_record_s),
 					   0, SLAB_HWCACHE_ALIGN, NULL, NULL);
 	if (jbd2_revoke_record_cache == 0)
 		return -ENOMEM;
 
-	jbd2_revoke_table_cache = kmem_cache_create("revoke_table",
+	jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
 					   sizeof(struct jbd2_revoke_table_s),
 					   0, 0, NULL, NULL);
 	if (jbd2_revoke_table_cache == 0) {

ext4 kernel patches against linux-2.6.18-rc7-mm1

[Alexandre Ratchov]

hi,

i've updated the ext4 kernel patches to 2.6.18-mm1. I've just done some
reordering/simplifications and fixed some minor bugs:

 - merge all 64bit "metadata" patches together

 - fix false-positive format warnings in balloc.c and resize.c because of
   arithmetic with 'unsigned long' variables:

   the following snippet:

	unsigned long x;
	unsigned long long long y;
	printf("%llu", x + y);
	
   triggers a warning on 64bit archs because gcc doen't
   seem to promote x + y to unsigned long long since long and long long
   have the same size and signedness. So we avoid the warning by:

	printf("%llu", (unsigned long long)(x + y));

 - fix ext4_blocks_count_set() and ext4_r_blocks_count_set() to use 64bit
   block numbers (ie ext4_fsblk_t) instead of __u32

 - coding style fixes: remove misplaced spaces, wrap some lines to 80 cols

 - fix ext4_check_descriptors() and ext4_group_add() to use 
   ext4_blocks_count() (returns full 64bit value) instead of just reading
   sbi->s_es->s_blocks_count (32bit low bits)

 - include fix for JBD2 not to use the same slab naming than JBD (fix from
   Johann Lomabardi)

 - remove unused EXT4_FREE_BLOCKS_COUNT() macro
   
 - update missing %u -> %llu replacements in resize.c

 - make 64bit ext4_super_block getters and setters inline C functions

Just to "summarize" the changes, here is attached a diff between results of
the old patch set and the updated patch set. The new patch set can be found
here:

http://www.bullopensource.org/ext4/20060926/

there are also patches for e2fsprogs-1.39 in sync with the kernel patch set;
both are tested on x86_64 with an 20TB devices.

cheers,

-- Alexandre


diff -ur verif/linux-2.6.18-mm1/fs/ext4/balloc.c linux-2.6.18-mm1/fs/ext4/balloc.c
--- verif/linux-2.6.18-mm1/fs/ext4/balloc.c	2006-09-26 19:59:00.000000000 +0200
+++ linux-2.6.18-mm1/fs/ext4/balloc.c	2006-09-26 19:49:10.000000000 +0200
@@ -554,8 +554,8 @@
 						bit + i, bitmap_bh->b_data)) {
 			jbd_unlock_bh_state(bitmap_bh);
 			ext4_error(sb, __FUNCTION__,
-				"bit already cleared for block %llu",
-				 block + i);
+				   "bit already cleared for block %llu",
+				   (ext4_fsblk_t)(block + i));
 			jbd_lock_bh_state(bitmap_bh);
 			BUFFER_TRACE(bitmap_bh, "bit already cleared");
 		} else {
diff -ur verif/linux-2.6.18-mm1/fs/ext4/resize.c linux-2.6.18-mm1/fs/ext4/resize.c
--- verif/linux-2.6.18-mm1/fs/ext4/resize.c	2006-09-26 19:59:04.000000000 +0200
+++ linux-2.6.18-mm1/fs/ext4/resize.c	2006-09-26 19:49:10.000000000 +0200
@@ -286,17 +286,6 @@
 	return err;
 }
 
-static void ext4_blocks_count_set(struct ext4_super_block *es, __u32 v)
-{
-	es->s_blocks_count = cpu_to_le32(v);
-	es->s_blocks_count_hi = cpu_to_le32(((__u64) v) >> 32);
-}
-
-static void ext4_r_blocks_count_set(struct ext4_super_block *es, __u32 v)
-{
-	es->s_r_blocks_count = cpu_to_le32(v);
-	es->s_r_blocks_count_hi = cpu_to_le32(((__u64) v) >> 32);
-}
 
 /*
  * Iterate through the groups which hold BACKUP superblock/GDT copies in an
@@ -352,12 +341,15 @@
 	int gdbackups = 0;
 
 	while ((grp = ext4_list_backups(sb, &three, &five, &seven)) < end) {
-		if (le32_to_cpu(*p++) != grp * EXT4_BLOCKS_PER_GROUP(sb) + blk){
+		if (le32_to_cpu(*p++) != 
+		    grp * EXT4_BLOCKS_PER_GROUP(sb) + blk){
 			ext4_warning(sb, __FUNCTION__,
 				     "reserved GDT %llu"
 				     " missing grp %d (%llu)",
 				     blk, grp,
-				     grp * EXT4_BLOCKS_PER_GROUP(sb) + blk);
+				     grp * 
+				     (ext4_fsblk_t)EXT4_BLOCKS_PER_GROUP(sb) + 
+				     blk);
 			return -EINVAL;
 		}
 		if (++gdbackups > EXT4_ADDR_PER_BLOCK(sb))
@@ -743,8 +735,8 @@
 		return -EPERM;
 	}
 
-	if (le32_to_cpu(es->s_blocks_count) + input->blocks_count <
-	    le32_to_cpu(es->s_blocks_count)) {
+	if (ext4_blocks_count(es) + input->blocks_count < 
+	    ext4_blocks_count(es)) {
 		ext4_warning(sb, __FUNCTION__, "blocks_count overflow\n");
 		return -EINVAL;
 	}
diff -ur verif/linux-2.6.18-mm1/fs/ext4/super.c linux-2.6.18-mm1/fs/ext4/super.c
--- verif/linux-2.6.18-mm1/fs/ext4/super.c	2006-09-26 19:59:04.000000000 +0200
+++ linux-2.6.18-mm1/fs/ext4/super.c	2006-09-26 19:49:10.000000000 +0200
@@ -62,17 +62,6 @@
 static void ext4_write_super (struct super_block * sb);
 static void ext4_write_super_lockfs(struct super_block *sb);
 
-ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
-{
-	return (ext4_fsblk_t) ((__u64)le32_to_cpu(es->s_blocks_count_hi) << 32 |
-				(__u64)le32_to_cpu(es->s_blocks_count));
-}
-
-ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es)
-{
-	return (ext4_fsblk_t) ((__u64)le32_to_cpu(es->s_r_blocks_count_hi) << 32 |
-				(__u64)le32_to_cpu(es->s_r_blocks_count));
-}
 
 ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
 			       struct ext4_group_desc *bg)
@@ -101,7 +90,7 @@
 void ext4_block_bitmap_set(struct super_block *sb,
 			   struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-	bg->bg_block_bitmap    = cpu_to_le32((u32)blk);
+	bg->bg_block_bitmap = cpu_to_le32((u32)blk);
 	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
 		bg->bg_block_bitmap_hi = cpu_to_le32(blk >> 32);
 }
@@ -109,7 +98,7 @@
 void ext4_inode_bitmap_set(struct super_block *sb,
 			   struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-	bg->bg_inode_bitmap    = cpu_to_le32((u32)blk);
+	bg->bg_inode_bitmap  = cpu_to_le32((u32)blk);
 	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
 		bg->bg_inode_bitmap_hi = cpu_to_le32(blk >> 32);
 }
@@ -117,18 +106,11 @@
 void ext4_inode_table_set(struct super_block *sb,
 			  struct ext4_group_desc *bg, ext4_fsblk_t blk)
 {
-	bg->bg_inode_table    = cpu_to_le32((u32)blk);
+	bg->bg_inode_table = cpu_to_le32((u32)blk);
 	if (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT)
 		bg->bg_inode_table_hi = cpu_to_le32(blk >> 32);
 }
 
-
-static void ext4_free_blocks_count_set(struct ext4_super_block *es, __u32 v)
-{
-	es->s_free_blocks_count = cpu_to_le32(v);
-	es->s_free_blocks_count_hi = cpu_to_le32(((__u64) v) >> 32);
-}
-
 /*
  * Wrappers for jbd2_journal_start/end.
  *
@@ -1261,7 +1243,7 @@
 	for (i = 0; i < sbi->s_groups_count; i++)
 	{
 		if (i == sbi->s_groups_count - 1)
-			last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
+			last_block = ext4_blocks_count(sbi->s_es) - 1;
 		else
 			last_block = first_block +
 				(EXT4_BLOCKS_PER_GROUP(sb) - 1);
diff -ur verif/linux-2.6.18-mm1/fs/jbd2/journal.c linux-2.6.18-mm1/fs/jbd2/journal.c
--- verif/linux-2.6.18-mm1/fs/jbd2/journal.c	2006-09-26 19:58:58.000000000 +0200
+++ linux-2.6.18-mm1/fs/jbd2/journal.c	2006-09-26 19:49:09.000000000 +0200
@@ -1643,7 +1643,7 @@
 
 static kmem_cache_t *jbd_slab[JBD_MAX_SLABS];
 static const char *jbd_slab_names[JBD_MAX_SLABS] = {
-	"jbd_1k", "jbd_2k", "jbd_4k", NULL, "jbd_8k"
+	"jbd2_1k", "jbd2_2k", "jbd2_4k", NULL, "jbd2_8k"
 };
 
 static void jbd2_journal_destroy_jbd_slabs(void)
@@ -1714,7 +1714,7 @@
 	int retval;
 
 	J_ASSERT(jbd2_journal_head_cache == 0);
-	jbd2_journal_head_cache = kmem_cache_create("journal_head",
+	jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head",
 				sizeof(struct journal_head),
 				0,		/* offset */
 				0,		/* flags */
@@ -2019,7 +2019,7 @@
 
 static int __init journal_init_handle_cache(void)
 {
-	jbd2_handle_cache = kmem_cache_create("journal_handle",
+	jbd2_handle_cache = kmem_cache_create("jbd2_journal_handle",
 				sizeof(handle_t),
 				0,		/* offset */
 				0,		/* flags */
diff -ur verif/linux-2.6.18-mm1/fs/jbd2/revoke.c linux-2.6.18-mm1/fs/jbd2/revoke.c
--- verif/linux-2.6.18-mm1/fs/jbd2/revoke.c	2006-09-26 19:58:58.000000000 +0200
+++ linux-2.6.18-mm1/fs/jbd2/revoke.c	2006-09-26 19:49:09.000000000 +0200
@@ -169,13 +169,13 @@
 
 int __init jbd2_journal_init_revoke_caches(void)
 {
-	jbd2_revoke_record_cache = kmem_cache_create("revoke_record",
+	jbd2_revoke_record_cache = kmem_cache_create("jbd2_revoke_record",
 					   sizeof(struct jbd2_revoke_record_s),
 					   0, SLAB_HWCACHE_ALIGN, NULL, NULL);
 	if (jbd2_revoke_record_cache == 0)
 		return -ENOMEM;
 
-	jbd2_revoke_table_cache = kmem_cache_create("revoke_table",
+	jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
 					   sizeof(struct jbd2_revoke_table_s),
 					   0, 0, NULL, NULL);
 	if (jbd2_revoke_table_cache == 0) {
diff -ur verif/linux-2.6.18-mm1/include/linux/ext4_fs.h linux-2.6.18-mm1/include/linux/ext4_fs.h
--- verif/linux-2.6.18-mm1/include/linux/ext4_fs.h	2006-09-26 19:59:04.000000000 +0200
+++ linux-2.6.18-mm1/include/linux/ext4_fs.h	2006-09-26 19:49:10.000000000 +0200
@@ -516,10 +516,6 @@
 	__u32	s_reserved[169];	/* Padding to the end of the block */
 };
 
-#define EXT4_FREE_BLOCKS_COUNT(s)					\
-	(ext4_fsblk_t)(((__u64)le32_to_cpu((s)->s_free_blocks_count_hi) << 32) | \
-		 (__u64)le32_to_cpu((s)->s_free_blocks_count))
-
 #ifdef __KERNEL__
 static inline struct ext4_sb_info * EXT4_SB(struct super_block *sb)
 {
@@ -909,8 +905,6 @@
 extern void ext4_warning (struct super_block *, const char *, const char *, ...)
 	__attribute__ ((format (printf, 3, 4)));
 extern void ext4_update_dynamic_rev (struct super_block *sb);
-extern ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es);
-extern ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es);
 extern ext4_fsblk_t ext4_block_bitmap(struct super_block *sb,
 				      struct ext4_group_desc *bg);
 extern ext4_fsblk_t ext4_inode_bitmap(struct super_block *sb,
@@ -924,6 +918,47 @@
 extern void ext4_inode_table_set(struct super_block *sb,
 				 struct ext4_group_desc *bg, ext4_fsblk_t blk);
 
+static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)
+{
+	return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |
+		le32_to_cpu(es->s_blocks_count);
+}
+
+static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es)
+{
+	return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) |
+		le32_to_cpu(es->s_r_blocks_count);
+}
+
+static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es)
+{
+	return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) |
+		le32_to_cpu(es->s_free_blocks_count);
+}
+
+static inline void ext4_blocks_count_set(struct ext4_super_block *es,
+					 ext4_fsblk_t blk)
+{
+	es->s_blocks_count = cpu_to_le32((u32)blk);
+	es->s_blocks_count_hi = cpu_to_le32(blk >> 32);
+}
+
+static inline void ext4_free_blocks_count_set(struct ext4_super_block *es,
+					      ext4_fsblk_t blk)
+{
+	es->s_free_blocks_count = cpu_to_le32((u32)blk);
+	es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32);
+}
+
+static inline void ext4_r_blocks_count_set(struct ext4_super_block *es,
+					   ext4_fsblk_t blk)
+{
+	es->s_r_blocks_count = cpu_to_le32((u32)blk);
+	es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32);
+}
+
+
+
 #define ext4_std_error(sb, errno)				\
 do {								\
 	if ((errno))						\

Re: ext4 kernel patches against linux-2.6.18-rc7-mm1

[Alexandre Ratchov]

On Tue, Sep 26, 2006 at 06:43:47PM +0200, Alexandre Ratchov wrote:
> hi,
> 
> i've updated the ext4 kernel patches to 2.6.18-mm1. I've just done some
> reordering/simplifications and fixed some minor bugs:
> 

the subject should have been: 

Subject: ext4 kernel patches against linux-2.6.18-mm1
					   ^^^^^^^^^^
oops...

-- Alexandre