Author: baggins Date: Tue Jul 12 10:23:35 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.0-rc7
---- Files affected:
packages/kernel:
kernel-vserver-2.3.patch (1.68 -> 1.69)
---- Diffs:
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.68
packages/kernel/kernel-vserver-2.3.patch:1.69
--- packages/kernel/kernel-vserver-2.3.patch:1.68 Mon Jul 11 23:36:25 2011
+++ packages/kernel/kernel-vserver-2.3.patch Tue Jul 12 12:23:30 2011
@@ -4652,15 +4652,20 @@
#include <asm/uaccess.h>
-@@ -163,6 +165,8 @@ static struct kmem_cache *filelock_cache
+@@ -163,7 +165,12 @@ static struct kmem_cache *filelock_cache
/* Allocate an empty lock structure. */
struct file_lock *locks_alloc_lock(void)
{
+- struct file_lock *fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
++ struct file_lock *fl;
++
+ if (!vx_locks_avail(1))
+ return NULL;
- return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
- }
- EXPORT_SYMBOL_GPL(locks_alloc_lock);
++
++ fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
+
+ if (fl)
+ locks_init_lock_always(fl);
@@ -190,6 +194,7 @@ void locks_free_lock(struct file_lock *f
BUG_ON(!list_empty(&fl->fl_block));
BUG_ON(!list_empty(&fl->fl_link));
@@ -4670,13 +4675,13 @@
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_ops = NULL;
- fl->fl_lmops = NULL;
+ fl->fl_xid = -1;
}
- EXPORT_SYMBOL(locks_init_lock);
+ /* 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.68&r2=1.69&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
