userns: Convert apparmor to use kuid and kgid where appropriate

[mirror_ubuntu-artful-kernel.git] / security / apparmor / include / file.h

diff --git a/security/apparmor/include/file.h b/security/apparmor/include/file.h
index f98fd4701d800f5eec9c39d01f94e3447a7eeb33..967b2deda376a2b3ff63821301b26ba600260fc6 100644 (file)
--- a/security/apparmor/include/file.h
+++ b/security/apparmor/include/file.h
@@ -71,7 +71,7 @@ struct path;
 
 /* need to make conditional which ones are being set */
 struct path_cond {
-       uid_t uid;
+       kuid_t uid;
        umode_t mode;
 };
 
@@ -146,7 +146,7 @@ static inline u16 dfa_map_xindex(u16 mask)
 
 int aa_audit_file(struct aa_profile *profile, struct file_perms *perms,
                  gfp_t gfp, int op, u32 request, const char *name,
-                 const char *target, uid_t ouid, const char *info, int error);
+                 const char *target, kuid_t ouid, const char *info, int error);
 
 /**
  * struct aa_file_rules - components used for file rule permissions