From e1dbef721927ebe23d3eaac1756718776efa35b3 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 23 May 2012 17:16:53 -0600
Subject: [PATCH] --- yaml --- r: 327221 b: refs/heads/master c:
 976d020150456fccbd34103fd117fab910eed09c h: refs/heads/master i:   327219:
 16e7841cb71de67a97b0087aa25c4a31dd55f1ad v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/sock.h | 2 +-
 trunk/net/core/sock.c    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8d5ff7afc9cf..9e38114ce832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d04a48b06d63b6d6e9289ca8a5e6e84ebfe39bfd
+refs/heads/master: 976d020150456fccbd34103fd117fab910eed09c
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index b3730239bf18..65c3d62bfa5a 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1668,7 +1668,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
 	write_unlock_bh(&sk->sk_callback_lock);
 }
 
-extern int sock_i_uid(struct sock *sk);
+extern kuid_t sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
 
 static inline struct dst_entry *
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 9c7fe4ff30fc..5c6a435717e0 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -1526,12 +1526,12 @@ void sock_edemux(struct sk_buff *skb)
 }
 EXPORT_SYMBOL(sock_edemux);
 
-int sock_i_uid(struct sock *sk)
+kuid_t sock_i_uid(struct sock *sk)
 {
-	int uid;
+	kuid_t uid;
 
 	read_lock_bh(&sk->sk_callback_lock);
-	uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : 0;
+	uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : GLOBAL_ROOT_UID;
 	read_unlock_bh(&sk->sk_callback_lock);
 	return uid;
 }