1
Index: linux-2.6.18.6/security/apparmor/apparmor.h
2
===================================================================
3
--- linux-2.6.18.6.orig/security/apparmor/apparmor.h
4
+++ linux-2.6.18.6/security/apparmor/apparmor.h
5
@@ -210,7 +210,7 @@ typedef int (*aa_iter) (struct subdomain
8
struct dentry *root, *dentry;
9
- struct mnt_namespace *mnt_namespace;
10
+ struct namespace *namespace;
11
struct list_head *head, *pos;
14
Index: linux-2.6.18.6/security/apparmor/inline.h
15
===================================================================
16
--- linux-2.6.18.6.orig/security/apparmor/inline.h
17
+++ linux-2.6.18.6/security/apparmor/inline.h
22
-#include <linux/mnt_namespace.h>
23
+#include <linux/namespace.h>
25
static inline int __aa_is_confined(struct subdomain *sd)
27
@@ -323,8 +323,8 @@ static inline void __aa_path_begin(struc
29
data->dentry = dentry;
30
data->root = dget(rdentry->d_sb->s_root);
31
- data->mnt_namespace = current->nsproxy->mnt_ns;
32
- data->head = &data->mnt_namespace->list;
33
+ data->namespace = current->namespace;
34
+ data->head = &data->namespace->list;
35
data->pos = data->head->next;
36
prefetch(data->pos->next);