← Back to branch summary

~ubuntu-branches/ubuntu/vivid/aufs/vivid

« back to all changes in this revision

Viewing changes to patch/openvz_028stab039.1.patch

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2007-12-15 23:32:51 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071215233251-2vgs2lmg8mai5d9e
Tags: 0+20071211-1ubuntu1
https://launchpad.net/bugs/175705
* Merge from debian unstable (LP: #175705), remaining changes:
  - Fix for Ubuntu Kernels (updated)
* patches/01_vserver.dpatch: Removed
* patches/06_ubuntu.dpatch: Added (update of ubuntu patch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
patch/openvz_028stab039.1.patch
 
1
To use this patch, you need these things,
 
2
- linux-2.6.18
 
3
- http://download.openvz.org/kernel/branches/2.6.18/028stab039.1/
 
4
        patches/patch-ovz028stab039.1-combined.gz
 
5
- define "EXTRA_CFLAGS += -DVE_028stab039" in aufs/local.mk
 
6
 
 
7
As you know, openvz uses simfs to support disk quota or something.
 
8
On my system, /proc/mounts shows,
 
9
        none /vz/private/203 aufs \
 
10
                rw,xino=(deleted)\040/tmp/rw/.aufs.xino,\
 
11
                udba=inotify,br:/tmp/rw=rw:/vz/private/203=ro 0 0
 
12
        /vz/private/203 /vz/root/203 simfs rw 0 0
 
13
 
 
14
----------------------------------------------------------------------
 
15
--- fs/aufs/super.c     2007-07-30 13:26:04.000000000 +0900
 
16
+++ fs/aufs/super.c     2007-09-10 13:36:48.381447152 +0900
 
17
@@ -29,7 +29,7 @@
 
18
 typedef struct mnt_namespace au_mnt_ns_t;
 
19
 #define au_nsproxy(tsk)        (tsk)->nsproxy
 
20
 #define au_mnt_ns(tsk) (tsk)->nsproxy->mnt_ns
 
21
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
 
22
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) || defined(VE_028stab039)
 
23
 #include <linux/namespace.h>
 
24
 typedef struct namespace au_mnt_ns_t;
 
25
 #define au_nsproxy(tsk)        (tsk)->nsproxy
 
26
@@ -144,11 +144,13 @@ static int aufs_show_options(struct seq_
 
27
                        goto out;
 
28
                err = 0;
 
29
 
 
30
+#ifndef VE_028stab039
 
31
 #define Deleted "\\040(deleted)"
 
32
                m->count -= sizeof(Deleted) - 1;
 
33
                AuDebugOn(memcmp(m->buf + m->count, Deleted,
 
34
                                 sizeof(Deleted) - 1));
 
35
 #undef Deleted
 
36
+#endif
 
37
        } else
 
38
                err = seq_puts(m, ",noxino");
 
39