Skip to content
Snippets Groups Projects
Commit f49753ed authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Branch HEAD

Fix 2.6.18 ext3 mballoc, extents patches for several omissions.
Reorder patch hunks to match other patches to facilitate comparisons.
b=10090  ldiskfs corruption under memory pressure, coverity fixes
b=6191   mballoc fails on x86_64 > 2TB
b=10634  mballoc using wrong find_next_bit() on big endian systems
b=6449   don't print "too long searching" message to console

Compile tested.
parent 95861d41
No related merge requests found
......@@ -2538,26 +2538,30 @@ Index: linux-stage/fs/ext3/super.c
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+ Opt_extents, Opt_extdebug,
+ Opt_extents, Opt_noextents, Opt_extdebug,
Opt_grpquota
};
@@ -690,6 +694,8 @@ static match_table_t tokens = {
@@ -690,6 +694,9 @@ static match_table_t tokens = {
{Opt_iopen, "iopen"},
{Opt_noiopen, "noiopen"},
{Opt_iopen_nopriv, "iopen_nopriv"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
+ {Opt_extdebug, "extdebug"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
@@ -1035,6 +1041,12 @@ clear_qf_name:
@@ -1035,6 +1041,15 @@ clear_qf_name:
case Opt_bh:
clear_opt(sbi->s_mount_opt, NOBH);
break;
+ case Opt_extents:
+ set_opt (sbi->s_mount_opt, EXTENTS);
+ break;
+ case Opt_noextents:
+ clear_opt (sbi->s_mount_opt, EXTENTS);
+ break;
+ case Opt_extdebug:
+ set_opt (sbi->s_mount_opt, EXTDEBUG);
+ break;
......
......@@ -2538,26 +2538,30 @@ Index: linux-stage/fs/ext3/super.c
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+ Opt_extents, Opt_extdebug,
+ Opt_extents, Opt_noextents, Opt_extdebug,
Opt_grpquota
};
@@ -690,6 +694,8 @@ static match_table_t tokens = {
@@ -690,6 +694,9 @@ static match_table_t tokens = {
{Opt_iopen, "iopen"},
{Opt_noiopen, "noiopen"},
{Opt_iopen_nopriv, "iopen_nopriv"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
+ {Opt_extdebug, "extdebug"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
@@ -1035,6 +1041,12 @@ clear_qf_name:
@@ -1035,6 +1041,15 @@ clear_qf_name:
case Opt_bh:
clear_opt(sbi->s_mount_opt, NOBH);
break;
+ case Opt_extents:
+ set_opt (sbi->s_mount_opt, EXTENTS);
+ break;
+ case Opt_noextents:
+ clear_opt (sbi->s_mount_opt, EXTENTS);
+ break;
+ case Opt_extdebug:
+ set_opt (sbi->s_mount_opt, EXTDEBUG);
+ break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment