linux26: adapted ext4 patch to 2.6.27.10

base/linux26/linux-2.6.git-03010a3350301baac2154fa66de925ae2981b7e3.patch

@@ -359,9 +359,9 @@ index 5295a92..92db9e9 100644
  	.listxattr	= ext4_listxattr,
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
 index 7d86560..0e661c5 100644
---- a/fs/ext4/super.c
+--- ./fs/ext4/super.c.orig	2008-12-21 21:26:34.000000000 +0200
-+++ b/fs/ext4/super.c
++++ ./fs/ext4/super.c	2008-12-21 21:31:32.000000000 +0200
-@@ -569,7 +569,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb)
+@@ -562,7 +562,7 @@
  	ei = kmem_cache_alloc(ext4_inode_cachep, GFP_NOFS);
  	if (!ei)
  		return NULL;
@@ -370,7 +370,7 @@ index 7d86560..0e661c5 100644
  	ei->i_acl = EXT4_ACL_NOT_CACHED;
  	ei->i_default_acl = EXT4_ACL_NOT_CACHED;
  #endif
-@@ -605,7 +605,7 @@ static void init_once(void *foo)
+@@ -599,7 +599,7 @@
  	struct ext4_inode_info *ei = (struct ext4_inode_info *) foo;
  
  	INIT_LIST_HEAD(&ei->i_orphan);
@@ -379,16 +379,16 @@ index 7d86560..0e661c5 100644
  	init_rwsem(&ei->xattr_sem);
  #endif
  	init_rwsem(&ei->i_data_sem);
-@@ -631,7 +631,7 @@ static void destroy_inodecache(void)
+@@ -626,7 +626,7 @@
- 
  static void ext4_clear_inode(struct inode *inode)
  {
+ 	struct ext4_block_alloc_info *rsv = EXT4_I(inode)->i_block_alloc_info;
 -#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
 +#ifdef CONFIG_EXT4_FS_POSIX_ACL
  	if (EXT4_I(inode)->i_acl &&
  			EXT4_I(inode)->i_acl != EXT4_ACL_NOT_CACHED) {
  		posix_acl_release(EXT4_I(inode)->i_acl);
-@@ -720,7 +720,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
+@@ -718,7 +718,7 @@
  		seq_puts(seq, ",debug");
  	if (test_opt(sb, OLDALLOC))
  		seq_puts(seq, ",oldalloc");
@@ -397,7 +397,7 @@ index 7d86560..0e661c5 100644
  	if (test_opt(sb, XATTR_USER) &&
  		!(def_mount_opts & EXT4_DEFM_XATTR_USER))
  		seq_puts(seq, ",user_xattr");
-@@ -729,7 +729,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
+@@ -727,7 +727,7 @@
  		seq_puts(seq, ",nouser_xattr");
  	}
  #endif
@@ -406,7 +406,7 @@ index 7d86560..0e661c5 100644
  	if (test_opt(sb, POSIX_ACL) && !(def_mount_opts & EXT4_DEFM_ACL))
  		seq_puts(seq, ",acl");
  	if (!test_opt(sb, POSIX_ACL) && (def_mount_opts & EXT4_DEFM_ACL))
-@@ -1078,7 +1078,7 @@ static int parse_options(char *options, struct super_block *sb,
+@@ -1072,7 +1072,7 @@
  		case Opt_orlov:
  			clear_opt(sbi->s_mount_opt, OLDALLOC);
  			break;
@@ -415,8 +415,8 @@ index 7d86560..0e661c5 100644
  		case Opt_user_xattr:
  			set_opt(sbi->s_mount_opt, XATTR_USER);
  			break;
-@@ -1092,7 +1092,7 @@ static int parse_options(char *options, struct super_block *sb,
+@@ -1085,7 +1085,7 @@
- 			       "not supported\n");
+ 			printk("EXT4 (no)user_xattr options not supported\n");
  			break;
  #endif
 -#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
@@ -424,7 +424,7 @@ index 7d86560..0e661c5 100644
  		case Opt_acl:
  			set_opt(sbi->s_mount_opt, POSIX_ACL);
  			break;
-@@ -1987,11 +1987,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+@@ -1977,11 +1977,11 @@
  		set_opt(sbi->s_mount_opt, GRPID);
  	if (def_mount_opts & EXT4_DEFM_UID16)
  		set_opt(sbi->s_mount_opt, NO_UID32);
@@ -438,7 +438,7 @@ index 7d86560..0e661c5 100644
  	if (def_mount_opts & EXT4_DEFM_ACL)
  		set_opt(sbi->s_mount_opt, POSIX_ACL);
  #endif
-@@ -2050,16 +2050,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2045,16 +2045,6 @@
  		       "running e2fsck is recommended\n");
  
  	/*
@@ -455,9 +455,9 @@ index 7d86560..0e661c5 100644
  	 * Check feature flags regardless of the revision level, since we
  	 * previously didn't change the revision level when setting the flags,
  	 * so there is a chance incompat flags are set on a rev 0 filesystem.
-@@ -3580,13 +3570,34 @@ const struct file_operations ext4_ui_proc_fops = {
+@@ -3520,13 +3510,34 @@
- };
+ 	return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super, mnt);
- #endif
+ }
  
 +static struct file_system_type ext4_fs_type = {
 +	.owner		= THIS_MODULE,
@@ -491,7 +491,7 @@ index 7d86560..0e661c5 100644
  
  static int __init init_ext4_fs(void)
  {
-@@ -3603,9 +3614,16 @@ static int __init init_ext4_fs(void)
+@@ -3542,9 +3553,16 @@
  	err = init_inodecache();
  	if (err)
  		goto out1;
@@ -509,7 +509,7 @@ index 7d86560..0e661c5 100644
  	return 0;
  out:
  	destroy_inodecache();
-@@ -3618,7 +3636,10 @@ out2:
+@@ -3557,7 +3575,10 @@
  
  static void __exit exit_ext4_fs(void)
  {