commit 018771051605c8213607316441fbb1d0663d667b
Author: Jan Rękorajski <[email protected]>
Date: Wed Apr 29 21:09:56 2015 +0200
- 3.10.76
kernel-aufs3.patch | 12 ++++++------
kernel-vserver-2.3.patch | 2 +-
kernel.spec | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ba65658..12390fa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,7 +71,7 @@
%define rel 1
%define basever 3.10
-%define postver .75
+%define postver .76
%define versuffix -%{basever}
@@ -116,7 +116,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: c12c17f2e33249a6e8cc200d7ad7f153
+# Patch0-md5: 0ecea7e99d9e7585061e56d7598ff6ab
%endif
Source1: kernel.sysconfig
diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch
index a93df4a..556bf98 100644
--- a/kernel-aufs3.patch
+++ b/kernel-aufs3.patch
@@ -5402,7 +5402,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c
linux/fs/aufs/dcsub.c
+ while (next != &this_parent->d_subdirs) {
+ struct list_head *tmp = next;
+ struct dentry *dentry = list_entry(tmp, struct dentry,
-+ d_u.d_child);
++ d_child);
+
+ next = tmp->next;
+ spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
@@ -5438,7 +5438,7 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c
linux/fs/aufs/dcsub.c
+ this_parent = tmp;
+ spin_lock(&this_parent->d_lock);
+ rcu_read_unlock();
-+ next = child->d_u.d_child.next;
++ next = child->d_child.next;
+ goto resume;
+ }
+
@@ -5752,7 +5752,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c
linux/fs/aufs/debug.c
+ struct dentry *d;
+
+ spin_lock(&inode->i_lock);
-+ hlist_for_each_entry(d, &inode->i_dentry, d_alias)
++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias)
+ au_dpri_dentry(d);
+ spin_unlock(&inode->i_lock);
+}
@@ -9692,7 +9692,7 @@ diff -urN /usr/share/empty/fs/aufs/export.c
linux/fs/aufs/export.c
+ dentry = d_find_alias(inode);
+ else {
+ spin_lock(&inode->i_lock);
-+ hlist_for_each_entry(d, &inode->i_dentry, d_alias) {
++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) {
+ spin_lock(&d->d_lock);
+ if (!au_test_anon(d)
+ && d->d_parent->d_inode->i_ino == dir_ino) {
@@ -13623,7 +13623,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c
linux/fs/aufs/hnotify.c
+ AuDebugOn(!name);
+ au_iigen_dec(inode);
+ spin_lock(&inode->i_lock);
-+ hlist_for_each_entry(d, &inode->i_dentry, d_alias) {
++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) {
+ spin_lock(&d->d_lock);
+ dname = &d->d_name;
+ if (dname->len != nlen
@@ -13789,7 +13789,7 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c
linux/fs/aufs/hnotify.c
+
+ dentry = NULL;
+ spin_lock(&parent->d_lock);
-+ list_for_each_entry(d, &parent->d_subdirs, d_u.d_child) {
++ list_for_each_entry(d, &parent->d_subdirs, d_child) {
+ /* AuDbg("%.*s\n", AuDLNPair(d)); */
+ spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
+ dname = &d->d_name;
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 4fb7855..4aae770 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -4010,7 +4010,7 @@ diff -NurpP --minimal linux-3.10.53/fs/libfs.c
linux-3.10.53-vs2.3.6.8/fs/libfs.
@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v
for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
struct dentry *next;
- next = list_entry(p, struct dentry,
d_u.d_child);
+ next = list_entry(p, struct dentry, d_child);
+ if (filter && !filter(next))
+ continue;
spin_lock_nested(&next->d_lock,
DENTRY_D_LOCK_NESTED);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/018771051605c8213607316441fbb1d0663d667b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
