X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=security%2Fapparmor%2Fapparmorfs.c;h=2ee3b3d29f10b4af7923b7499d32bf96e55e0a7e;hb=c4fbde84fedeaf513ec96f0c6ed3f352bdcd61d6;hp=f95c6bfa8b8ecfe0c75047cf2c5f9715f763eb5b;hpb=e42ee56fe59759023cb252fabb3d6f279fe8cec8;p=linux-2.6-microblaze.git

diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index f95c6bfa8b8e..2ee3b3d29f10 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -1773,7 +1773,8 @@ fail2:
 	return error;
 }
 
-static int ns_mkdir_op(struct inode *dir, struct dentry *dentry, umode_t mode)
+static int ns_mkdir_op(struct user_namespace *mnt_userns, struct inode *dir,
+		       struct dentry *dentry, umode_t mode)
 {
 	struct aa_ns *ns, *parent;
 	/* TODO: improve permission check */