Revert "UBUNTU: ubuntu: AUFS -- update to standalone 2.6.35-rcN as at 20100601"

This reverts commit bb05516aec3ef56a2b7e82d042a537e63e144be1.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/ubuntu/aufs/debug.c b/ubuntu/aufs/debug.c
index abe286a..6fbe34f 100644 (file)
--- a/ubuntu/aufs/debug.c
+++ b/ubuntu/aufs/debug.c
@@ -243,11 +243,11 @@ static int do_pri_br(aufs_bindex_t bindex, struct au_branch *br)
                goto out;
 
        dpri("s%d: {perm 0x%x, cnt %d, wbr %p}, "
-            "%s, dev 0x%02x%02x, flags 0x%lx, cnt %d, active %d, "
+            "%s, dev 0x%02x%02x, flags 0x%lx, cnt(BIAS) %d, active %d, "
             "xino %d\n",
             bindex, br->br_perm, atomic_read(&br->br_count), br->br_wbr,
             au_sbtype(sb), MAJOR(sb->s_dev), MINOR(sb->s_dev),
-            sb->s_flags, sb->s_count,
+            sb->s_flags, sb->s_count - S_BIAS,
             atomic_read(&sb->s_active), !!br->br_xino.xi_file);
        return 0;
 

diff --git a/ubuntu/aufs/dir.c b/ubuntu/aufs/dir.c
index 6ff01bc..fe8737f 100644 (file)
--- a/ubuntu/aufs/dir.c
+++ b/ubuntu/aufs/dir.c
@@ -325,7 +325,7 @@ static int au_do_fsync_dir(struct file *file, int datasync)
                if (!h_file || au_test_ro(sb, bindex, inode))
                        continue;
 
-               err = vfs_fsync(h_file, datasync);
+               err = vfs_fsync(h_file, h_file->f_dentry, datasync);
                if (!err) {
                        h_mtx = &h_file->f_dentry->d_inode->i_mutex;
                        mutex_lock(h_mtx);

diff --git a/ubuntu/aufs/include/linux/aufs_type.h b/ubuntu/aufs/include/linux/aufs_type.h
index 35b39e0..52e9efa 100644 (file)
--- a/ubuntu/aufs/include/linux/aufs_type.h
+++ b/ubuntu/aufs/include/linux/aufs_type.h
@@ -27,7 +27,7 @@
 #include <linux/limits.h>
 #include <linux/types.h>
 
-#define AUFS_VERSION   "2-standalone.tree-35-rcN-20100531"
+#define AUFS_VERSION   "2-standalone.tree-34-20100531"
 
 /* todo? move this to linux-2.6.19/include/magic.h */
 #define AUFS_SUPER_MAGIC       ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')