Revert "UBUNTU: SAUCE: (no-up) apparmor: Fix incompatible pointer type warnings"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 5a22abd4.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

security/apparmor/af_unix.c

@@ -21,17 +21,12 @@
 #include "include/path.h"
 #include "include/policy.h"
 
-static inline struct sock *aa_sock(struct unix_sock *u)
-{
-	return &u->sk;
-}
-
 static inline int unix_fs_perm(int op, u32 mask, struct aa_label *label,
 			       struct unix_sock *u, int flags)
 {
 	AA_BUG(!label);
 	AA_BUG(!u);
-	AA_BUG(!UNIX_FS(aa_sock(u)));
+	AA_BUG(!UNIX_FS(u));
 
 	if (unconfined(label) || !LABEL_MEDIATES(label, AA_CLASS_FILE))
 		return 0;
@@ -531,9 +526,9 @@ int aa_unix_peer_perm(struct aa_label *label, int op, u32 request,
 	AA_BUG(!sk);
 	AA_BUG(!peer_sk);
 
-	if (UNIX_FS(aa_sock(peeru)))
+	if (UNIX_FS(peeru))
 		return unix_fs_perm(op, request, label, peeru, 0);
-	else if (UNIX_FS(aa_sock(u)))
+	else if (UNIX_FS(u))
 		return unix_fs_perm(op, request, label, u, 0);
 	else {
 		struct aa_profile *profile;