From 16da31bd7170a57480a4893ae99ad578f9b5c92c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 29 Apr 2015 20:39:33 +0200 Subject: [PATCH] - 3.14.40 --- kernel-aufs3.patch | 12 ++++++------ kernel-vserver-2.3.patch | 4 ++-- kernel.spec | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch index 12955763..2e59ec73 100644 --- a/kernel-aufs3.patch +++ b/kernel-aufs3.patch @@ -5812,7 +5812,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); @@ -5848,7 +5848,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; + } + @@ -6195,7 +6195,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); +} @@ -10155,7 +10155,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) { @@ -14088,7 +14088,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 @@ -14253,7 +14253,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("%pd\n", 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 ff3c537c..f9e31c6a 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -3986,7 +3986,7 @@ diff -NurpP --minimal linux-3.14.17/fs/libfs.c linux-3.14.17-vs2.3.6.13/fs/libfs - struct dentry *cursor = file->private_data; + struct dentry *dentry = filp->f_path.dentry; + struct dentry *cursor = filp->private_data; - struct list_head *p, *q = &cursor->d_u.d_child; + struct list_head *p, *q = &cursor->d_child; - if (!dir_emit_dots(file, ctx)) + if (!dir_emit_dots(filp, ctx)) @@ -3996,7 +3996,7 @@ diff -NurpP --minimal linux-3.14.17/fs/libfs.c linux-3.14.17-vs2.3.6.13/fs/libfs @@ -159,6 +160,8 @@ int dcache_readdir(struct file *file, st for (p = q->next; p != &dentry->d_subdirs; p = p->next) { - struct dentry *next = list_entry(p, struct dentry, d_u.d_child); + struct dentry *next = list_entry(p, struct dentry, d_child); + if (filter && !filter(next)) + continue; spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); diff --git a/kernel.spec b/kernel.spec index f3a1327e..53a16a7a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -70,7 +70,7 @@ %define rel 1 %define basever 3.14 -%define postver .39 +%define postver .40 %define versuffix -%{basever} @@ -115,7 +115,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: b621207b3f6ecbb67db18b13258f8ea8 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Patch0-md5: 218b2bb75d29f418f855c321226d6649 +# Patch0-md5: 66247eb18af8498a9131d675d5ce4609 %endif Source1: kernel.sysconfig -- 2.44.0