From 65e483e4aa96b9b5e38d82eb9bc7438e71a912ef Mon Sep 17 00:00:00 2001
From: John Johansen <john.johansen@canonical.com>
Date: Thu, 1 Feb 2007 01:11:07 +0000
Subject: [PATCH] Allow apparmor to run on 2.6.20

---
 module/apparmor/inline.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/apparmor/inline.h b/module/apparmor/inline.h
index f7da5aeea..e20b27b16 100644
--- a/module/apparmor/inline.h
+++ b/module/apparmor/inline.h
@@ -10,7 +10,7 @@
 #ifndef __INLINE_H
 #define __INLINE_H
 
-#include <linux/namespace.h>
+#include <linux/mnt_namespace.h>
 
 static inline int __aa_is_confined(struct subdomain *sd)
 {
@@ -323,8 +323,8 @@ static inline void __aa_path_begin(struct dentry *rdentry,
 {
 	data->dentry = dentry;
 	data->root = dget(rdentry->d_sb->s_root);
-	data->namespace = current->namespace;
-	data->head = &data->namespace->list;
+	data->mnt_namespace = current->nsproxy->mnt_ns;
+	data->head = &data->mnt_namespace->list;
 	data->pos = data->head->next;
 	prefetch(data->pos->next);
 	data->errno = 0;