- fix aufs patch for inode changes

- reset release to 1

diff --git a/kernel-aufs3.patch b/kernel-aufs3.patch
index b84ccd4f4568423aeab8f586d5c5f64b9144a984..83652a80199a6aa7d00afdc0200422bda372c86c 100644 (file)
--- 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 0925f3a9cb362f6df5ef1ba6d94288c5c4b625bb..b1baf3c7536a2d7a76244efe6c752b614582e863 100644 (file)
--- 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