Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-2658 llite: too many arguments in generic_file_llseek_size
[fs/lustre-release.git]
/
ldiskfs
/
kernel_patches
/
patches
/
ext4-extents-mount-option-rhel6.patch
diff --git
a/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
b/ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
index
a40b8a2
..
59da6f6
100644
(file)
--- a/
ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
+++ b/
ldiskfs/kernel_patches/patches/ext4-extents-mount-option-rhel6.patch
@@
-94,22
+94,22
@@
Index: linux-stage/fs/ext4/super.c
seq_puts(seq, ",i_version");
if (!test_opt(sb, DELALLOC))
@@ -1515,6 +1517,7 @@ enum {
seq_puts(seq, ",i_version");
if (!test_opt(sb, DELALLOC))
@@ -1515,6 +1517,7 @@ enum {
+ Opt_stripe, Opt_delalloc, Opt_nodelalloc,
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_inode_readahead_blks, Opt_journal_ioprio,
- Opt_discard, Opt_nodiscard,
Opt_mballoc, Opt_bigendian_extents, Opt_force_over_128tb,
+ Opt_extents, Opt_noextents,
Opt_mballoc, Opt_bigendian_extents, Opt_force_over_128tb,
+ Opt_extents, Opt_noextents,
+ Opt_discard, Opt_nodiscard,
+ Opt_init_inode_table, Opt_noinit_inode_table,
};
};
-
- static const match_table_t tokens = {
@@ -1589,6 +1592,8 @@ static const match_table_t tokens = {
@@ -1589,6 +1592,8 @@ static const match_table_t tokens = {
+ {Opt_noauto_da_alloc, "noauto_da_alloc"},
+ {Opt_bigendian_extents, "bigendian_extents"},
{Opt_mballoc, "mballoc"},
{Opt_mballoc, "mballoc"},
- {Opt_discard, "discard"},
- {Opt_nodiscard, "nodiscard"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
- {Opt_
err, NULL
},
- };
-
+ {Opt_
discard, "discard"
},
+ {Opt_nodiscard, "nodiscard"},
+ {Opt_init_inode_table, "init_itable=%u"},
@@ -1631,6 +1636,7 @@ static int parse_options(char *options,
int qtype, qfmt;
char *qname;
@@ -1631,6 +1636,7 @@ static int parse_options(char *options,
int qtype, qfmt;
char *qname;
@@
-151,7
+151,7
@@
Index: linux-stage/fs/ext4/super.c
default:
ext4_msg(sb, KERN_ERR,
"Unrecognized mount option \"%s\" "
default:
ext4_msg(sb, KERN_ERR,
"Unrecognized mount option \"%s\" "
-@@ -2901,6 +2933,1
7
@@ static int ext4_fill_super(struct super_
+@@ -2901,6 +2933,1
4
@@ static int ext4_fill_super(struct super_
set_opt(sbi->s_mount_opt, BARRIER);
/*
set_opt(sbi->s_mount_opt, BARRIER);
/*
@@
-161,9
+161,6
@@
Index: linux-stage/fs/ext4/super.c
+ */
+ if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))
+ set_opt(sbi->s_mount_opt, EXTENTS);
+ */
+ if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS))
+ set_opt(sbi->s_mount_opt, EXTENTS);
-+ else
-+ ext4_warning(sb, "extents feature not enabled on this filesystem, "
-+ "use tune2fs.");
+
+ /*
* enable delayed allocation by default
+
+ /*
* enable delayed allocation by default