[Pkg-lustre-svn-commit] r443 - in /trunk/ldiskfs/kernel_patches/patches: ext3-extents-2.6.22-vanilla_from_l1642.patch ext3-mballoc3-2.6.22.patch
goswin-guest at users.alioth.debian.org
goswin-guest at users.alioth.debian.org
Wed Feb 13 16:39:07 UTC 2008
Author: goswin-guest
Date: Wed Feb 13 16:39:07 2008
New Revision: 443
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=443
Log:
Fix bug that mount option didn't get accepted. Moves end-of-array
entry to the actual end of array.
Modified:
trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch
trunk/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch?rev=443&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-extents-2.6.22-vanilla_from_l1642.patch Wed Feb 13 16:39:07 2008
@@ -1,7 +1,7 @@
Index: linux-stage/fs/ext3/dir.c
===================================================================
---- linux-stage.orig/fs/ext3/dir.c 2008-02-11 20:44:55.000000000 +0100
-+++ linux-stage/fs/ext3/dir.c 2008-02-11 20:44:56.000000000 +0100
+--- linux-stage.orig/fs/ext3/dir.c 2008-02-13 16:07:38.000000000 +0100
++++ linux-stage/fs/ext3/dir.c 2008-02-13 16:07:39.000000000 +0100
@@ -133,8 +133,7 @@ static int ext3_readdir(struct file * fi
struct buffer_head *bh = NULL;
@@ -15,7 +15,7 @@
Index: linux-stage/fs/ext3/extents.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-stage/fs/ext3/extents.c 2008-02-12 17:07:18.000000000 +0100
++++ linux-stage/fs/ext3/extents.c 2008-02-13 17:26:15.000000000 +0100
@@ -0,0 +1,2272 @@
+/*
+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
@@ -2291,8 +2291,8 @@
+EXPORT_SYMBOL(ext3_ext_calc_credits_for_insert);
Index: linux-stage/fs/ext3/ialloc.c
===================================================================
---- linux-stage.orig/fs/ext3/ialloc.c 2008-02-11 20:44:56.000000000 +0100
-+++ linux-stage/fs/ext3/ialloc.c 2008-02-12 17:07:18.000000000 +0100
+--- linux-stage.orig/fs/ext3/ialloc.c 2008-02-13 16:07:39.000000000 +0100
++++ linux-stage/fs/ext3/ialloc.c 2008-02-13 17:26:14.000000000 +0100
@@ -651,6 +651,17 @@ got:
ext3_std_error(sb, err);
goto fail_free_drop;
@@ -2313,8 +2313,8 @@
goto really_out;
Index: linux-stage/fs/ext3/inode.c
===================================================================
---- linux-stage.orig/fs/ext3/inode.c 2008-02-11 20:44:56.000000000 +0100
-+++ linux-stage/fs/ext3/inode.c 2008-02-12 17:07:18.000000000 +0100
+--- linux-stage.orig/fs/ext3/inode.c 2008-02-13 16:07:39.000000000 +0100
++++ linux-stage/fs/ext3/inode.c 2008-02-13 17:26:15.000000000 +0100
@@ -40,8 +40,6 @@
#include "iopen.h"
#include "acl.h"
@@ -2403,8 +2403,8 @@
"block %ld\n", iblock);
Index: linux-stage/fs/ext3/super.c
===================================================================
---- linux-stage.orig/fs/ext3/super.c 2008-02-11 20:44:56.000000000 +0100
-+++ linux-stage/fs/ext3/super.c 2008-02-12 17:07:19.000000000 +0100
+--- linux-stage.orig/fs/ext3/super.c 2008-02-13 16:07:39.000000000 +0100
++++ linux-stage/fs/ext3/super.c 2008-02-13 17:26:42.000000000 +0100
@@ -392,6 +392,7 @@ static void ext3_put_super (struct super
struct ext3_super_block *es = sbi->s_es;
int i;
@@ -2432,13 +2432,16 @@
};
static match_table_t tokens = {
-@@ -731,6 +735,9 @@ static match_table_t tokens = {
+@@ -729,8 +733,11 @@ static match_table_t tokens = {
+ {Opt_noiopen, "noiopen"},
+ {Opt_iopen_nopriv, "iopen_nopriv"},
{Opt_barrier, "barrier=%u"},
- {Opt_err, NULL},
+- {Opt_err, NULL},
{Opt_resize, "resize"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
+ {Opt_extdebug, "extdebug"},
++ {Opt_err, NULL}
};
static ext3_fsblk_t get_sb_block(void **data)
@@ -2470,7 +2473,7 @@
Index: linux-stage/include/linux/ext3_extents.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-stage/include/linux/ext3_extents.h 2008-02-12 17:07:15.000000000 +0100
++++ linux-stage/include/linux/ext3_extents.h 2008-02-13 17:26:12.000000000 +0100
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
@@ -2705,8 +2708,8 @@
+
Index: linux-stage/include/linux/ext3_fs.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h 2008-02-11 20:44:56.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs.h 2008-02-12 17:07:19.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs.h 2008-02-13 16:07:39.000000000 +0100
++++ linux-stage/include/linux/ext3_fs.h 2008-02-13 17:26:15.000000000 +0100
@@ -178,8 +178,9 @@ struct ext3_group_desc
#define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
#define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
@@ -2786,8 +2789,8 @@
Index: linux-stage/include/linux/ext3_fs_i.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_i.h 2008-02-11 20:44:55.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs_i.h 2008-02-12 17:07:18.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs_i.h 2008-02-13 16:07:38.000000000 +0100
++++ linux-stage/include/linux/ext3_fs_i.h 2008-02-13 17:26:15.000000000 +0100
@@ -65,6 +65,16 @@ struct ext3_block_alloc_info {
#define rsv_end rsv_window._rsv_end
@@ -2816,8 +2819,8 @@
#endif /* _LINUX_EXT3_FS_I */
Index: linux-stage/include/linux/ext3_fs_sb.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_sb.h 2008-02-11 20:44:55.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs_sb.h 2008-02-12 17:07:19.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs_sb.h 2008-02-13 16:07:38.000000000 +0100
++++ linux-stage/include/linux/ext3_fs_sb.h 2008-02-13 17:26:15.000000000 +0100
@@ -78,6 +78,16 @@ struct ext3_sb_info {
char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
int s_jquota_fmt; /* Format of quota to use */
@@ -2837,8 +2840,8 @@
#endif /* _LINUX_EXT3_FS_SB */
Index: linux-stage/include/linux/ext3_jbd.h
===================================================================
---- linux-stage.orig/include/linux/ext3_jbd.h 2008-02-11 20:44:55.000000000 +0100
-+++ linux-stage/include/linux/ext3_jbd.h 2008-02-12 17:10:13.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_jbd.h 2008-02-13 16:07:38.000000000 +0100
++++ linux-stage/include/linux/ext3_jbd.h 2008-02-13 16:07:39.000000000 +0100
@@ -26,9 +26,17 @@
*
* We may have to touch one inode, one bitmap buffer, up to three
@@ -2882,8 +2885,8 @@
#define EXT3_QUOTA_INIT_BLOCKS(sb) 0
Index: linux-stage/fs/ext3/Makefile
===================================================================
---- linux-stage.orig/fs/ext3/Makefile 2008-02-11 20:44:56.000000000 +0100
-+++ linux-stage/fs/ext3/Makefile 2008-02-12 17:07:18.000000000 +0100
+--- linux-stage.orig/fs/ext3/Makefile 2008-02-13 16:07:39.000000000 +0100
++++ linux-stage/fs/ext3/Makefile 2008-02-13 17:26:14.000000000 +0100
@@ -5,7 +5,8 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
Modified: trunk/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch?rev=443&op=diff
==============================================================================
--- trunk/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch (original)
+++ trunk/ldiskfs/kernel_patches/patches/ext3-mballoc3-2.6.22.patch Wed Feb 13 16:39:07 2008
@@ -1,7 +1,7 @@
Index: linux-stage/include/linux/ext3_fs_i.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_i.h 2008-02-11 18:08:22.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs_i.h 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs_i.h 2008-02-13 17:26:15.000000000 +0100
++++ linux-stage/include/linux/ext3_fs_i.h 2008-02-13 17:26:58.000000000 +0100
@@ -154,6 +154,10 @@ struct ext3_inode_info {
struct inode vfs_inode;
@@ -15,8 +15,8 @@
#endif /* _LINUX_EXT3_FS_I */
Index: linux-stage/include/linux/ext3_fs_sb.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_sb.h 2008-02-11 18:09:53.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs_sb.h 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs_sb.h 2008-02-13 17:26:53.000000000 +0100
++++ linux-stage/include/linux/ext3_fs_sb.h 2008-02-13 17:26:58.000000000 +0100
@@ -21,8 +21,15 @@
#include <linux/wait.h>
#include <linux/blockgroup_lock.h>
@@ -35,8 +35,8 @@
* third extended-fs super-block data in memory
Index: linux-stage/include/linux/ext3_fs.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h 2008-02-11 18:09:53.000000000 +0100
-+++ linux-stage/include/linux/ext3_fs.h 2008-02-11 18:19:21.000000000 +0100
+--- linux-stage.orig/include/linux/ext3_fs.h 2008-02-13 17:26:53.000000000 +0100
++++ linux-stage/include/linux/ext3_fs.h 2008-02-13 17:26:58.000000000 +0100
@@ -18,6 +18,7 @@
#include <linux/types.h>
@@ -139,8 +139,8 @@
int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,
Index: linux-stage/fs/ext3/super.c
===================================================================
---- linux-stage.orig/fs/ext3/super.c 2008-02-11 18:09:53.000000000 +0100
-+++ linux-stage/fs/ext3/super.c 2008-02-11 18:10:45.000000000 +0100
+--- linux-stage.orig/fs/ext3/super.c 2008-02-13 17:26:53.000000000 +0100
++++ linux-stage/fs/ext3/super.c 2008-02-13 17:27:55.000000000 +0100
@@ -684,6 +684,7 @@ enum {
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_grpquota, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
@@ -149,16 +149,16 @@
};
static match_table_t tokens = {
-@@ -741,6 +742,9 @@ static match_table_t tokens = {
+@@ -740,6 +741,9 @@ static match_table_t tokens = {
{Opt_extents, "extents"},
{Opt_noextents, "noextents"},
{Opt_extdebug, "extdebug"},
-+ {Opt_mballoc, "mballoc"},
-+ {Opt_nomballoc, "nomballoc"},
-+ {Opt_stripe, "stripe=%u"},
++ {Opt_mballoc, "mballoc"},
++ {Opt_nomballoc, "nomballoc"},
++ {Opt_stripe, "stripe=%u"},
+ {Opt_err, NULL}
};
- static ext3_fsblk_t get_sb_block(void **data)
@@ -1092,6 +1096,19 @@ clear_qf_name:
case Opt_extdebug:
set_opt (sbi->s_mount_opt, EXTDEBUG);
@@ -189,8 +189,8 @@
return 0;
Index: linux-stage/fs/ext3/extents.c
===================================================================
---- linux-stage.orig/fs/ext3/extents.c 2008-02-11 18:08:22.000000000 +0100
-+++ linux-stage/fs/ext3/extents.c 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/fs/ext3/extents.c 2008-02-13 17:26:15.000000000 +0100
++++ linux-stage/fs/ext3/extents.c 2008-02-13 17:26:58.000000000 +0100
@@ -801,7 +801,7 @@ cleanup:
for (i = 0; i < depth; i++) {
if (!ablocks[i])
@@ -325,8 +325,8 @@
* probably we need not scaning at all,
Index: linux-stage/fs/ext3/xattr.c
===================================================================
---- linux-stage.orig/fs/ext3/xattr.c 2008-02-11 18:08:22.000000000 +0100
-+++ linux-stage/fs/ext3/xattr.c 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/fs/ext3/xattr.c 2008-02-13 17:26:15.000000000 +0100
++++ linux-stage/fs/ext3/xattr.c 2008-02-13 17:26:58.000000000 +0100
@@ -488,7 +488,7 @@ ext3_xattr_release_block(handle_t *handl
ea_bdebug(bh, "refcount now=0; freeing");
if (ce)
@@ -347,8 +347,8 @@
}
Index: linux-stage/fs/ext3/balloc.c
===================================================================
---- linux-stage.orig/fs/ext3/balloc.c 2008-02-11 18:08:22.000000000 +0100
-+++ linux-stage/fs/ext3/balloc.c 2008-02-11 18:17:27.000000000 +0100
+--- linux-stage.orig/fs/ext3/balloc.c 2008-02-13 17:26:15.000000000 +0100
++++ linux-stage/fs/ext3/balloc.c 2008-02-13 17:26:58.000000000 +0100
@@ -90,7 +90,7 @@ struct ext3_group_desc * ext3_get_group_
*
* Return buffer_head on success or NULL in case of failure.
@@ -422,8 +422,8 @@
unsigned long count = 1;
Index: linux-stage/fs/ext3/inode.c
===================================================================
---- linux-stage.orig/fs/ext3/inode.c 2008-02-11 18:08:22.000000000 +0100
-+++ linux-stage/fs/ext3/inode.c 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/fs/ext3/inode.c 2008-02-13 17:26:15.000000000 +0100
++++ linux-stage/fs/ext3/inode.c 2008-02-13 17:26:58.000000000 +0100
@@ -560,7 +560,7 @@ static int ext3_alloc_blocks(handle_t *h
return ret;
failed_out:
@@ -478,8 +478,8 @@
/*
Index: linux-stage/fs/ext3/mballoc.c
===================================================================
---- linux-stage.orig/fs/ext3/mballoc.c 2008-02-11 18:09:56.000000000 +0100
-+++ linux-stage/fs/ext3/mballoc.c 2008-02-11 18:09:58.000000000 +0100
+--- linux-stage.orig/fs/ext3/mballoc.c 2008-02-13 17:26:53.000000000 +0100
++++ linux-stage/fs/ext3/mballoc.c 2008-02-13 17:26:58.000000000 +0100
@@ -350,8 +350,8 @@ struct ext3_prealloc_space {
spinlock_t pa_lock;
atomic_t pa_count;
@@ -591,8 +591,8 @@
struct super_block *sb = inode->i_sb;
Index: linux-stage/fs/ext3/Makefile
===================================================================
---- linux-stage.orig/fs/ext3/Makefile 2008-02-11 18:13:30.000000000 +0100
-+++ linux-stage/fs/ext3/Makefile 2008-02-11 18:13:39.000000000 +0100
+--- linux-stage.orig/fs/ext3/Makefile 2008-02-13 17:26:14.000000000 +0100
++++ linux-stage/fs/ext3/Makefile 2008-02-13 17:26:58.000000000 +0100
@@ -6,7 +6,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o
ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
More information about the Pkg-lustre-svn-commit
mailing list