Re: patch update for 3.0.14 & 3.1.6

On Thu, Dec 22, 2011 at 10:26:22PM -0600, Corey Wright wrote:
> for anybody that might try building the latest stable kernels
> patched with linux-vserver over this christmas weekend...

> the attached patches account for changes to fs/ext4/super.c in
> 3.0.14 and 3.1.6 that cause the patch-3.0.13-vs2.3.2.1.diff and
> patch-3.1.5-vs2.3.2.5.diff patches to generate rejects. (the
> patches also account for the version change in Makefile.)

> 1. extract 3.0.14/3.1.6 kernel source code.
> 2. patch with latest upstream patch.
> 3. patch with my patch.
> 4. clean up rejects and originals if necessary (ie find -type f -regex "^.*
> \(\.rej\|~\)$" -exec rm -vf {} \;)
> 5. build resulting linux-vserver kernel.

> i've tested the resulting kernels against testme.sh and testfs.sh (ext2,
> ext3, & ext4).

thanks and because folks on the IRC channel asked if
this is a proper 'fix' and wanted some confirmation
from an 'approved' source

yes, fix is trivial, only a change in the option names
but nevertheless, I uploaded an updated version of the
3.0.x and 3.1.x patches to correct this issue ...

happy holidays,
Herbert

> corey
> --
> [email protected]

> diff -urNpd linux-3.0.14-vs2.3.2.1-rej/fs/ext4/super.c linux-3.0.14-vs2.3.2.1/fs/ext4/super.c
> --- linux-3.0.14-vs2.3.2.1-rej/fs/ext4/super.c	2011-12-22 10:06:23.000000000 -0600
> +++ linux-3.0.14-vs2.3.2.1/fs/ext4/super.c	2011-12-22 10:04:03.000000000 -0600
> @@ -1292,6 +1292,7 @@ enum {
>  	Opt_inode_readahead_blks, Opt_journal_ioprio,
>  	Opt_dioread_nolock, Opt_dioread_lock,
>  	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
> +	Opt_tag, Opt_notag, Opt_tagid
>  };

>  static const match_table_t tokens = {
> @@ -1367,6 +1368,9 @@ static const match_table_t tokens = {
>  	{Opt_init_itable, "init_itable=%u"},
>  	{Opt_init_itable, "init_itable"},
>  	{Opt_noinit_itable, "noinit_itable"},
> +	{Opt_tag, "tag"},
> +	{Opt_notag, "notag"},
> +	{Opt_tagid, "tagid=%u"},
>  	{Opt_err, NULL},
>  };

> diff -urNpd linux-3.0.14-vs2.3.2.1-rej/Makefile linux-3.0.14-vs2.3.2.1/Makefile
> --- linux-3.0.14-vs2.3.2.1-rej/Makefile	2011-12-22 10:06:23.000000000 -0600
> +++ linux-3.0.14-vs2.3.2.1/Makefile	2011-12-22 10:05:20.000000000 -0600
> @@ -1,7 +1,7 @@
>  VERSION = 3
>  PATCHLEVEL = 0
>  SUBLEVEL = 14
> -EXTRAVERSION =
> +EXTRAVERSION = -vs2.3.2.1
>  NAME = Sneaky Weasel

>  # *DOCUMENTATION*

> diff -urNpd linux-3.1.6-vs2.3.2.5-rej/fs/ext4/super.c linux-3.1.6-vs2.3.2.5/fs/ext4/super.c
> --- linux-3.1.6-vs2.3.2.5-rej/fs/ext4/super.c	2011-12-22 10:13:11.000000000 -0600
> +++ linux-3.1.6-vs2.3.2.5/fs/ext4/super.c	2011-12-22 10:12:28.000000000 -0600
> @@ -1319,6 +1319,7 @@ enum {
>  	Opt_inode_readahead_blks, Opt_journal_ioprio,
>  	Opt_dioread_nolock, Opt_dioread_lock,
>  	Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable,
> +	Opt_tag, Opt_notag, Opt_tagid
>  };

>  static const match_table_t tokens = {
> @@ -1394,6 +1395,9 @@ static const match_table_t tokens = {
>  	{Opt_init_itable, "init_itable=%u"},
>  	{Opt_init_itable, "init_itable"},
>  	{Opt_noinit_itable, "noinit_itable"},
> +	{Opt_tag, "tag"},
> +	{Opt_notag, "notag"},
> +	{Opt_tagid, "tagid=%u"},
>  	{Opt_err, NULL},
>  };

> diff -urNpd linux-3.1.6-vs2.3.2.5-rej/Makefile linux-3.1.6-vs2.3.2.5/Makefile
> --- linux-3.1.6-vs2.3.2.5-rej/Makefile	2011-12-22 10:13:11.000000000 -0600
> +++ linux-3.1.6-vs2.3.2.5/Makefile	2011-12-22 10:12:48.000000000 -0600
> @@ -1,7 +1,7 @@
>  VERSION = 3
>  PATCHLEVEL = 1
>  SUBLEVEL = 6
> -EXTRAVERSION =
> +EXTRAVERSION = -vs2.3.2.5
>  NAME = "Divemaster Edition"

>  # *DOCUMENTATION*