X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=linux-2.6-570-tagxid.patch;h=7b88f577f00e4aae49a961b8874747649b90c1b6;hb=refs%2Fheads%2F27;hp=f0c23d7f4d29d32931ae001125f590c3a263bd2d;hpb=6d01321c96cd6467f754d4a1dd2ee43790405be7;p=linux-2.6.git

diff --git a/linux-2.6-570-tagxid.patch b/linux-2.6-570-tagxid.patch
index f0c23d7f4..7b88f577f 100644
--- a/linux-2.6-570-tagxid.patch
+++ b/linux-2.6-570-tagxid.patch
@@ -1,7 +1,7 @@
-diff -Nurp linux-2.6.22-560/fs/ext2/super.c linux-2.6.22-570/fs/ext2/super.c
---- linux-2.6.22-560/fs/ext2/super.c	2007-12-04 14:51:22.000000000 -0500
-+++ linux-2.6.22-570/fs/ext2/super.c	2007-12-05 16:19:17.000000000 -0500
-@@ -350,6 +350,7 @@ static match_table_t tokens = {
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/fs/ext2/super.c linux-2.6.27.10-vs2.3.x-P570/fs/ext2/super.c
+--- linux-2.6.27.10-vs2.3.x-P/fs/ext2/super.c	2008-10-13 14:54:20.000000000 +0200
++++ linux-2.6.27.10-vs2.3.x-P570/fs/ext2/super.c	2009-01-12 01:18:23.000000000 +0100
+@@ -420,6 +420,7 @@ static match_table_t tokens = {
  	{Opt_noacl, "noacl"},
  	{Opt_xip, "xip"},
  	{Opt_tag, "tag"},
@@ -9,45 +9,34 @@ diff -Nurp linux-2.6.22-560/fs/ext2/super.c linux-2.6.22-570/fs/ext2/super.c
  	{Opt_notag, "notag"},
  	{Opt_tagid, "tagid=%u"},
  	{Opt_grpquota, "grpquota"},
-diff -Nurp linux-2.6.22-560/fs/ext3/super.c linux-2.6.22-570/fs/ext3/super.c
---- linux-2.6.22-560/fs/ext3/super.c	2007-12-04 14:51:22.000000000 -0500
-+++ linux-2.6.22-570/fs/ext3/super.c	2007-12-05 16:19:02.000000000 -0500
-@@ -725,6 +725,7 @@ static match_table_t tokens = {
- 	{Opt_usrquota, "usrquota"},
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/fs/ext3/super.c linux-2.6.27.10-vs2.3.x-P570/fs/ext3/super.c
+--- linux-2.6.27.10-vs2.3.x-P/fs/ext3/super.c	2008-11-17 18:20:41.000000000 +0100
++++ linux-2.6.27.10-vs2.3.x-P570/fs/ext3/super.c	2009-01-12 01:18:23.000000000 +0100
+@@ -809,6 +809,7 @@ static match_table_t tokens = {
  	{Opt_barrier, "barrier=%u"},
+ 	{Opt_resize, "resize"},
  	{Opt_tag, "tag"},
 +	{Opt_tag, "tagxid"},
  	{Opt_notag, "notag"},
  	{Opt_tagid, "tagid=%u"},
  	{Opt_err, NULL},
-diff -Nurp linux-2.6.22-560/fs/ext4/super.c linux-2.6.22-570/fs/ext4/super.c
---- linux-2.6.22-560/fs/ext4/super.c	2007-12-04 14:51:22.000000000 -0500
-+++ linux-2.6.22-570/fs/ext4/super.c	2007-12-05 16:19:32.000000000 -0500
-@@ -777,6 +777,7 @@ static match_table_t tokens = {
- 	{Opt_barrier, "barrier=%u"},
- 	{Opt_extents, "extents"},
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/fs/ext4/super.c linux-2.6.27.10-vs2.3.x-P570/fs/ext4/super.c
+--- linux-2.6.27.10-vs2.3.x-P/fs/ext4/super.c	2008-12-08 04:52:52.000000000 +0100
++++ linux-2.6.27.10-vs2.3.x-P570/fs/ext4/super.c	2009-01-12 01:18:23.000000000 +0100
+@@ -969,6 +969,7 @@ static match_table_t tokens = {
+ 	{Opt_delalloc, "delalloc"},
+ 	{Opt_nodelalloc, "nodelalloc"},
  	{Opt_tag, "tag"},
 +	{Opt_tag, "tagxid"},
  	{Opt_notag, "notag"},
  	{Opt_tagid, "tagid=%u"},
  	{Opt_err, NULL},
-diff -Nurp linux-2.6.22-560/fs/jffs2/super.c linux-2.6.22-570/fs/jffs2/super.c
---- linux-2.6.22-560/fs/jffs2/super.c	2007-12-04 14:51:22.000000000 -0500
-+++ linux-2.6.22-570/fs/jffs2/super.c	2007-12-05 16:20:28.000000000 -0500
-@@ -82,6 +82,7 @@ enum {
- 
- static match_table_t tokens = {
- 	{Opt_tag, "tag"},
-+	{Opt_tag, "tagxid"},
- 	{Opt_notag, "notag"},
- 	{Opt_err, NULL}
- };
-diff -Nurp linux-2.6.22-560/fs/ocfs2/super.c linux-2.6.22-570/fs/ocfs2/super.c
---- linux-2.6.22-560/fs/ocfs2/super.c	2007-12-04 14:51:23.000000000 -0500
-+++ linux-2.6.22-570/fs/ocfs2/super.c	2007-12-05 16:21:04.000000000 -0500
-@@ -156,6 +156,7 @@ static match_table_t tokens = {
- 	{Opt_data_writeback, "data=writeback"},
- 	{Opt_atime_quantum, "atime_quantum=%u"},
+diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-P/fs/ocfs2/super.c linux-2.6.27.10-vs2.3.x-P570/fs/ocfs2/super.c
+--- linux-2.6.27.10-vs2.3.x-P/fs/ocfs2/super.c	2008-10-13 14:54:20.000000000 +0200
++++ linux-2.6.27.10-vs2.3.x-P570/fs/ocfs2/super.c	2009-01-12 01:18:23.000000000 +0100
+@@ -175,6 +175,7 @@ static match_table_t tokens = {
+ 	{Opt_localflocks, "localflocks"},
+ 	{Opt_stack, "cluster_stack=%s"},
  	{Opt_tag, "tag"},
 +	{Opt_tag, "tagxid"},
  	{Opt_notag, "notag"},