From 76c43b649457d2b4b3956fcd67306da4c73b41e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 19 Apr 2015 10:18:03 +0200 Subject: [PATCH] - fix aufs patch for inode changes - reset release to 1 --- kernel-aufs3.patch | 12 ++++++------ kernel.spec | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch index b84ccd4f..83652a80 100644 --- a/kernel-aufs3.patch +++ b/kernel-aufs3.patch @@ -4957,7 +4957,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); @@ -4993,7 +4993,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; + } + @@ -5308,7 +5308,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c + struct dentry *d; + + spin_lock(&inode->i_lock); -+ list_for_each_entry(d, &inode->i_dentry, d_alias) ++ list_for_each_entry(d, &inode->i_dentry, d_u.d_alias) + au_dpri_dentry(d); + spin_unlock(&inode->i_lock); +} @@ -9310,7 +9310,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); -+ list_for_each_entry(d, &inode->i_dentry, d_alias) { ++ list_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) { @@ -13102,7 +13102,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); -+ list_for_each_entry(d, &inode->i_dentry, d_alias) { ++ list_for_each_entry(d, &inode->i_dentry, d_u.d_alias) { + spin_lock(&d->d_lock); + dname = &d->d_name; + if (dname->len != nlen @@ -13268,7 +13268,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.spec b/kernel.spec index 0925f3a9..b1baf3c7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -91,7 +91,7 @@ %define have_pcmcia 0 %endif -%define rel 3 +%define rel 1 %define basever 3.4 %define postver .107 -- 2.44.0