[pve-devel] r6166 - pve-kernel-2.6.32-rh/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-24 13:56:56 +0200 (Fri, 24 Jun 2011)
New Revision: 6166

Modified:
   pve-kernel-2.6.32-rh/trunk/do-not-use-barrier-on-ext3.patch
Log:


Modified: pve-kernel-2.6.32-rh/trunk/do-not-use-barrier-on-ext3.patch
===================================================================
--- pve-kernel-2.6.32-rh/trunk/do-not-use-barrier-on-ext3.patch	2011-06-24 11:53:10 UTC (rev 6165)
+++ pve-kernel-2.6.32-rh/trunk/do-not-use-barrier-on-ext3.patch	2011-06-24 11:56:56 UTC (rev 6166)
@@ -1,11 +1,11 @@
---- linux-2.6-2.6.32/fs/ext3/super.c.org	2011-06-24 10:04:40.000000000 +0200
-+++ linux-2.6-2.6.32/fs/ext3/super.c	2011-06-24 10:05:14.000000000 +0200
-@@ -1224,7 +1224,7 @@
- 				if (match_int(&args[0], &option))
- 					return 0;
- 			} else
--				option = 1;	/* No argument, default to 1 */
-+				option = 0;	/* No argument, default to 0 */
- 			if (option)
- 				set_opt(sbi->s_mount_opt, BARRIER);
- 			else
+--- linux-2.6-2.6.32/fs/ext3/super.c.org	2011-06-24 13:51:47.000000000 +0200
++++ linux-2.6-2.6.32/fs/ext3/super.c	2011-06-24 13:52:01.000000000 +0200
+@@ -1698,8 +1698,6 @@
+ 	else
+ 		set_opt(sbi->s_mount_opt, ERRORS_RO);
+ 
+-	set_opt(sbi->s_mount_opt, BARRIER);
+-
+ 	sbi->s_resuid = le16_to_cpu(es->s_def_resuid);
+ 	sbi->s_resgid = le16_to_cpu(es->s_def_resgid);
+