← Back to branch summary

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

« back to all changes in this revision

Viewing changes to patch/vserver.patch

  • Committer: Bazaar Package Importer
  • Author(s): Julian Andres Klode
  • Date: 2008-08-21 14:58:54 UTC
  • mfrom: (1.2.1 upstream) (11 intrepid)
  • mto: This revision was merged to the branch mainline in revision 12.
  • Revision ID: james.westby@ubuntu.com-20080821145854-6erljbzg007r476y
http://bugs.debian.org/495921
01_vserver_apparmor.dpatch: [UPDATE] Disable vserver patches on kernel 
2.6.26, because they are not needed anymore. (Closes: #495921)

Show diffs side-by-side

added added

removed removed

Lines of Context:
patch/vserver.patch
 
1
 
 
2
This patch was originally written by Wilhelm Meier.
 
3
 
 
4
Index: fs/aufs/vfsub.h
 
5
===================================================================
 
6
RCS file: /cvsroot/aufs/aufs/fs/aufs/vfsub.h,v
 
7
retrieving revision 1.16
 
8
diff -u -p -r1.16 vfsub.h
 
9
--- fs/aufs/vfsub.h     12 Aug 2007 21:55:27 -0000      1.16
 
10
+++ fs/aufs/vfsub.h     5 Sep 2007 06:33:58 -0000
 
11
@@ -201,7 +201,11 @@ int do_vfsub_symlink(struct inode *dir, 
 
12
        LKTRTrace("i%lu, %.*s, %s, 0x%x\n",
 
13
                  dir->i_ino, DLNPair(dentry), symname, mode);
 
14
 
 
15
+#ifdef CONFIG_VSERVER
 
16
+       err = vfs_symlink(dir, dentry, symname, mode, NULL);
 
17
+#else
 
18
        err = vfs_symlink(dir, dentry, symname, mode);
 
19
+#endif
 
20
        if (!err) {
 
21
                au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
 
22
                au_update_fuse_h_inode(NULL, dentry); /*ignore*/
 
23
@@ -217,7 +221,11 @@ int do_vfsub_mknod(struct inode *dir, st
 
24
 
 
25
        LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, DLNPair(dentry), mode);
 
26
 
 
27
+#ifdef CONFIG_VSERVER
 
28
+       err = vfs_mknod(dir, dentry, mode, dev, NULL);
 
29
+#else
 
30
        err = vfs_mknod(dir, dentry, mode, dev);
 
31
+#endif
 
32
        if (!err) {
 
33
                au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
 
34
                au_update_fuse_h_inode(NULL, dentry); /*ignore*/
 
35
@@ -235,7 +243,11 @@ int do_vfsub_link(struct dentry *src_den
 
36
                  DLNPair(src_dentry), dir->i_ino, DLNPair(dentry));
 
37
 
 
38
        lockdep_off();
 
39
+#ifdef CONFIG_VSERVER
 
40
+       err = vfs_link(src_dentry, dir, dentry, NULL);
 
41
+#else
 
42
        err = vfs_link(src_dentry, dir, dentry);
 
43
+#endif
 
44
        lockdep_on();
 
45
        if (!err) {
 
46
                LKTRTrace("src_i %p, dst_i %p\n", src_dentry->d_inode, dentry->d_inode);
 
47
@@ -275,7 +287,11 @@ int do_vfsub_mkdir(struct inode *dir, st
 
48
 
 
49
        LKTRTrace("i%lu, %.*s, 0x%x\n", dir->i_ino, DLNPair(dentry), mode);
 
50
 
 
51
+#ifdef CONFIG_VSERVER
 
52
+       err = vfs_mkdir(dir, dentry, mode, NULL);
 
53
+#else
 
54
        err = vfs_mkdir(dir, dentry, mode);
 
55
+#endif
 
56
        if (!err) {
 
57
                au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
 
58
                au_update_fuse_h_inode(NULL, dentry); /*ignore*/
 
59
@@ -290,7 +306,11 @@ static inline int do_vfsub_rmdir(struct 
 
60
        LKTRTrace("i%lu, %.*s\n", dir->i_ino, DLNPair(dentry));
 
61
 
 
62
        lockdep_off();
 
63
+#ifdef CONFIG_VSERVER
 
64
+       err = vfs_rmdir(dir, dentry, NULL);
 
65
+#else
 
66
        err = vfs_rmdir(dir, dentry);
 
67
+#endif
 
68
        lockdep_on();
 
69
        if (!err)
 
70
                au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/
 
71
@@ -305,7 +325,11 @@ static inline int do_vfsub_unlink(struct
 
72
 
 
73
        /* vfs_unlink() locks inode */
 
74
        lockdep_off();
 
75
+#ifdef CONFIG_VSERVER
 
76
+       err = vfs_unlink(dir, dentry, NULL);
 
77
+#else
 
78
        err = vfs_unlink(dir, dentry);
 
79
+#endif
 
80
        lockdep_on();
 
81
        if (!err)
 
82
                au_update_fuse_h_inode(NULL, dentry->d_parent); /*ignore*/