- 3.10.76

diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch
index a93df4a68f7431228787a92cdb271f027eb31c2c..556bf98c21116266efd414134d425a86e62e930e 100644 (file)
--- 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 4fb7855c71bc7f14a372bd8a0bcfec52edb1a7b5..4aae77059edc8f75f4cc4ac98fb2b60f09012973 100644 (file)
--- 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);

diff --git a/kernel.spec b/kernel.spec
index ba65658617d2beb82f69cb68a8a46a314b03a9d7..12390fa792ccb00344ece7783d722dbc3a4f440e 100644 (file)
--- 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