packages: kernel/kernel-vserver-2.3.patch - reordered fixed hunks

[baggins]

Author: baggins                      Date: Tue Jul 12 10:27:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reordered fixed hunks

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.69 packages/kernel/kernel-vserver-2.3.patch:1.70
--- packages/kernel/kernel-vserver-2.3.patch:1.69	Tue Jul 12 12:23:30 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Tue Jul 12 12:27:51 2011
@@ -4652,7 +4652,15 @@
  
  #include <asm/uaccess.h>
  
-@@ -163,7 +165,12 @@ static struct kmem_cache *filelock_cache
+@@ -163,6 +168,7 @@ static void locks_init_lock_always(struc
+ 	fl->fl_flags = 0;
+ 	fl->fl_type = 0;
+ 	fl->fl_start = fl->fl_end = 0;
++	fl->fl_xid = -1;
+ }
+ 
+ /* Allocate an empty lock structure. */
+@@ -173,7 +175,12 @@ static struct kmem_cache *filelock_cache
  /* Allocate an empty lock structure. */
  struct file_lock *locks_alloc_lock(void)
  {
@@ -4674,14 +4682,6 @@
  	locks_release_private(fl);
  	kmem_cache_free(filelock_cache, fl);
  }
-@@ -211,6 +216,7 @@ void locks_init_lock(struct file_lock *f
- 	fl->fl_flags = 0;
- 	fl->fl_type = 0;
- 	fl->fl_start = fl->fl_end = 0;
-+	fl->fl_xid = -1;
- }
- 
- /* Allocate an empty lock structure. */
 @@ -262,6 +268,7 @@ void locks_copy_lock(struct file_lock *n
  	new->fl_file = fl->fl_file;
  	new->fl_ops = fl->fl_ops;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.69&r2=1.70&f=u