SOURCES (LINUX_2_6_20): linux-2.6-vs2.3.patch - fix for fs/ocfs2/s...

[mguevara]

Author: mguevara                     Date: Tue Jan 16 14:26:34 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fix for fs/ocfs2/super.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.2.16 -> 1.2.2.17) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.16 SOURCES/linux-2.6-vs2.3.patch:1.2.2.17
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.16	Tue Jan 16 15:19:22 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Jan 16 15:26:29 2007
@@ -9291,17 +9291,17 @@
 --- linux-2.6.19.1/fs/ocfs2/super.c	2006-11-30 21:19:28 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/fs/ocfs2/super.c	2006-11-08 04:57:52 +0100
 @@ -141,6 +141,7 @@ enum {
- 	Opt_hb_local,
  	Opt_data_ordered,
  	Opt_data_writeback,
+ 	Opt_atime_quantum,
 +	Opt_tag, Opt_notag, Opt_tagid,
  	Opt_err,
  };
  
 @@ -154,6 +155,10 @@ static match_table_t tokens = {
- 	{Opt_hb_local, OCFS2_HB_LOCAL},
  	{Opt_data_ordered, "data=ordered"},
  	{Opt_data_writeback, "data=writeback"},
+ 	{Opt_atime_quantum, "atime_quantum=%u"},
 +	{Opt_tag, "tag"},
 +	{Opt_tag, "tagxid"},
 +	{Opt_notag, "notag"},
@@ -9331,9 +9331,9 @@
 +	if (osb->s_mount_opt & OCFS2_MOUNT_TAGGED)
 +		sb->s_flags |= MS_TAGGED;
 +
- 	printk(KERN_INFO "ocfs2: Mounting device (%s) on (node %d, slot %d) "
- 	       "with %s data mode.\n",
- 	       osb->dev_str, osb->node_num, osb->slot_num,
+ 	if (ocfs2_mount_local(osb))
+ 		snprintf(nodestr, sizeof(nodestr), "local");
+ 	else
 @@ -747,6 +763,20 @@ static int ocfs2_parse_options(struct su
  		case Opt_data_writeback:
  			*mount_opt |= OCFS2_MOUNT_DATA_WRITEBACK;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.16&r2=1.2.2.17&f=u