SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - merged http://vserver...

[zbyniu]

Author: zbyniu                       Date: Mon May  5 23:13:15 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- merged http://vserver.13thfloor.at/Experimental/delta-locks-fix02.diff
- updated for 2.6.24.6

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.20 -> 1.2.4.11.2.21) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.20 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.21
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.20	Sun Apr 20 20:39:54 2008
+++ SOURCES/linux-2.6-vs2.3.patch	Tue May  6 01:13:08 2008
@@ -163,8 +163,8 @@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 24
--EXTRAVERSION = .5
-+EXTRAVERSION = .5-vs2.3.0.34
+-EXTRAVERSION = .6
++EXTRAVERSION = .6-vs2.3.0.34
  NAME = Err Metey! A Heury Beelge-a Ret!
  
  # *DOCUMENTATION*
@@ -6118,7 +6118,7 @@
  
  	locks_copy_lock(new_fl, lease);
  	locks_insert_lock(before, new_fl);
-+	vx_locks_inc(fl);
++	vx_locks_inc(new_fl);
  
  	*flp = new_fl;
  	return 0;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.20&r2=1.2.4.11.2.21&f=u