Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fixed for bug 22237
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-max-dir-size-rhel5.patch
diff --git a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch
index 3e34f6e..bbf2ba8 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-max-dir-size-rhel5.patch
@@ -1,11 +1,10 @@
-Index: linux-2.6.18.i386/fs/ext4/ialloc.c
-===================================================================
---- linux-2.6.18.i386.orig/fs/ext4/ialloc.c
-+++ linux-2.6.18.i386/fs/ext4/ialloc.c
-@@ -622,12 +622,15 @@ struct inode *ext4_new_inode(handle_t *h
+diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ialloc.c linux-2.6.18-164.6.1_2//fs/ext4/ialloc.c
+--- linux-2.6.18-164.6.1_1//fs/ext4/ialloc.c   2010-03-31 17:42:50.000000000 +0530
++++ linux-2.6.18-164.6.1_2//fs/ext4/ialloc.c   2010-03-31 17:43:22.000000000 +0530
+@@ -710,12 +710,15 @@ struct inode *ext4_new_inode_goal(handle
        sb = dir->i_sb;
-       trace_mark(ext4_request_inode, "dev %s dir %lu mode %d", sb->s_id,
-                  dir->i_ino, mode);
+       trace_mark(ext4_request_inode, "dev %s dir %lu mode %d", sb->s_id,
+                  dir->i_ino, mode);
 +      sbi = EXT4_SB(sb);
 +      if (sbi->s_max_dir_size > 0 && i_size_read(dir) >= sbi->s_max_dir_size)
 +              return ERR_PTR(-EFBIG);
@@ -18,12 +17,11 @@ Index: linux-2.6.18.i386/fs/ext4/ialloc.c
 -      sbi = EXT4_SB(sb);
        es = sbi->s_es;
  
-       if (goal) {
-Index: linux-2.6.18.i386/fs/ext4/super.c
-===================================================================
---- linux-2.6.18.i386.orig/fs/ext4/super.c
-+++ linux-2.6.18.i386/fs/ext4/super.c
-@@ -38,6 +38,7 @@
+       if (goal && goal <= le32_to_cpu(es->s_inodes_count)) {
+diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/super.c linux-2.6.18-164.6.1_2//fs/ext4/super.c
+--- linux-2.6.18-164.6.1_1//fs/ext4/super.c    2010-03-31 17:42:50.000000000 +0530
++++ linux-2.6.18-164.6.1_2//fs/ext4/super.c    2010-03-31 17:45:32.000000000 +0530
+@@ -40,6 +40,7 @@
  #include <asm/uaccess.h>
  #include <linux/kthread.h>
  #include <linux/utsname.h>
@@ -31,15 +29,15 @@ Index: linux-2.6.18.i386/fs/ext4/super.c
  
  #include "ext4.h"
  #include "ext4_jbd2.h"
-@@ -551,6 +554,7 @@ static void ext4_put_super(struct super_
-               ext4_commit_super(sb, es, 1);
-       }
-       if (sbi->s_proc) {
+@@ -581,6 +582,7 @@ static void ext4_put_super(struct super_
+               ext4_commit_super(sb, es, 1);
+       }
+       if (sbi->s_proc) {
 +              remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc);
-               remove_proc_entry("inode_readahead_blks", sbi->s_proc);
-               remove_proc_entry(sb->s_id, ext4_proc_root);
-       }
-@@ -2185,6 +2191,48 @@ static unsigned long ext4_get_stripe_siz
+               remove_proc_entry("inode_readahead_blks", sbi->s_proc);
+               remove_proc_entry("inode_goal", sbi->s_proc);
+               remove_proc_entry(sb->s_id, ext4_proc_root);
+@@ -2341,6 +2343,48 @@ static unsigned long ext4_get_stripe_siz
        return 0;
  }
  
@@ -88,9 +86,9 @@ Index: linux-2.6.18.i386/fs/ext4/super.c
  static int ext4_fill_super(struct super_block *sb, void *data, int silent)
                                __releases(kernel_lock)
                                __acquires(kernel_lock)
-@@ -2743,6 +2790,20 @@ static int ext4_fill_super(struct super_
-                       p->proc_fops = &ext4_ui_proc_fops,
-                       p->data = &sbi->s_inode_goal;
+@@ -2690,6 +2734,19 @@ static int ext4_fill_super(struct super_
+                       p->proc_fops = &ext4_ui_proc_fops,
+                       p->data = &sbi->s_inode_goal;
                }
 +              sbi->s_max_dir_size = EXT4_DEFAULT_MAX_DIR_SIZE;
 +              p = create_proc_entry(EXT4_MAX_DIR_SIZE_NAME,
@@ -98,7 +96,6 @@ Index: linux-2.6.18.i386/fs/ext4/super.c
 +              if (p == NULL) {
 +                      printk(KERN_ERR "EXT4-fs: unable to create %s\n",
 +                             EXT4_MAX_DIR_SIZE_NAME);
-+                      remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc);
 +                      ret = -ENOMEM;
 +                      goto failed_mount;
 +              }
@@ -106,14 +103,21 @@ Index: linux-2.6.18.i386/fs/ext4/super.c
 +              p->read_proc = ext4_max_dir_size_read;
 +              p->write_proc = ext4_max_dir_size_write;
 +
-       }
+       }
  #endif
  
-Index: linux-2.6.18.i386/fs/ext4/ext4_sb.h
-===================================================================
---- linux-2.6.18.i386.orig/fs/ext4/ext4_sb.h
-+++ linux-2.6.18.i386/fs/ext4/ext4_sb.h
-@@ -117,6 +117,7 @@ struct ext4_sb_info {
+@@ -2976,6 +3033,7 @@ failed_mount2:
+       kfree(sbi->s_group_desc);
+ failed_mount:
+       if (sbi->s_proc) {
++              remove_proc_entry(EXT4_MAX_DIR_SIZE_NAME, sbi->s_proc);
+               remove_proc_entry("inode_readahead_blks", sbi->s_proc);
+               remove_proc_entry("inode_goal", sbi->s_proc);
+               remove_proc_entry(sb->s_id, ext4_proc_root);
+diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ext4_sb.h linux-2.6.18-164.6.1_2//fs/ext4/ext4_sb.h
+--- linux-2.6.18-164.6.1_1//fs/ext4/ext4_sb.h  2010-03-31 17:42:50.000000000 +0530
++++ linux-2.6.18-164.6.1_2//fs/ext4/ext4_sb.h  2010-03-31 17:43:22.000000000 +0530
+@@ -119,6 +119,7 @@ struct ext4_sb_info {
        /* where last allocation was done - for stream allocation */
        unsigned long s_mb_last_group;
        unsigned long s_mb_last_start;
@@ -121,20 +125,20 @@ Index: linux-2.6.18.i386/fs/ext4/ext4_sb.h
  
        /* history to debug policy */
        struct ext4_mb_history *s_mb_history;
-Index: linux-2.6.18.i386/fs/ext4/ext4.h
-===================================================================
---- linux-2.6.18.i386.orig/fs/ext4/ext4.h
-+++ linux-2.6.18.i386/fs/ext4/ext4.h
-@@ -992,6 +992,12 @@ struct mmp_struct {
-  */
+diff -rupN linux-2.6.18-164.6.1_1//fs/ext4/ext4.h linux-2.6.18-164.6.1_2//fs/ext4/ext4.h
+--- linux-2.6.18-164.6.1_1//fs/ext4/ext4.h     2010-03-31 17:42:50.000000000 +0530
++++ linux-2.6.18-164.6.1_2//fs/ext4/ext4.h     2010-03-31 17:43:22.000000000 +0530
+@@ -1029,6 +1029,12 @@ struct mmp_struct {
  #define EXT4_MMP_MIN_CHECK_INTERVAL   5
  
-+/*
+ /*
 + * max directory size tunable
 + */
 +#define EXT4_DEFAULT_MAX_DIR_SIZE     0
 +#define EXT4_MAX_DIR_SIZE_NAME                "max_dir_size"
 +
- /*
++/*
   * Function prototypes
   */
+ 
+
Lustre primary development and releases