From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Aug 2012 06:45:52 +0000 (+1000)
Subject: Merge remote-tracking branch 'userns/for-next'
X-Git-Tag: next-20120820~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b39903e495b35a5659fc91d9acbf1c8f61d9a01;p=karo-tx-linux.git

Merge remote-tracking branch 'userns/for-next'
---

7b39903e495b35a5659fc91d9acbf1c8f61d9a01
diff --cc net/ipv4/tcp_ipv4.c
index 09356b3644d1,642be8a4c6a3..d6132f800844
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -2390,10 -2382,10 +2390,10 @@@ void tcp_proc_unregister(struct net *ne
  EXPORT_SYMBOL(tcp_proc_unregister);
  
  static void get_openreq4(const struct sock *sk, const struct request_sock *req,
- 			 struct seq_file *f, int i, int uid, int *len)
+ 			 struct seq_file *f, int i, kuid_t uid, int *len)
  {
  	const struct inet_request_sock *ireq = inet_rsk(req);
 -	int ttd = req->expires - jiffies;
 +	long delta = req->expires - jiffies;
  
  	seq_printf(f, "%4d: %08X:%04X %08X:%04X"
  		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
@@@ -2405,9 -2397,9 +2405,9 @@@
  		TCP_SYN_RECV,
  		0, 0, /* could print option size, but that is af dependent. */
  		1,    /* timers active (only the expire timer) */
 -		jiffies_to_clock_t(ttd),
 +		jiffies_delta_to_clock_t(delta),
  		req->retrans,
- 		uid,
+ 		from_kuid_munged(seq_user_ns(f), uid),
  		0,  /* non standard timer */
  		0, /* open_requests have no inode */
  		atomic_read(&sk->sk_refcnt),
@@@ -2456,9 -2448,9 +2456,9 @@@ static void get_tcp4_sock(struct sock *
  		tp->write_seq - tp->snd_una,
  		rx_queue,
  		timer_active,
 -		jiffies_to_clock_t(timer_expires - jiffies),
 +		jiffies_delta_to_clock_t(timer_expires - jiffies),
  		icsk->icsk_retransmits,
- 		sock_i_uid(sk),
+ 		from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)),
  		icsk->icsk_probes_out,
  		sock_i_ino(sk),
  		atomic_read(&sk->sk_refcnt), sk,
diff --cc net/ipv6/tcp_ipv6.c
index 94987b8fc0fd,4b5b335ebde1..4d63dffcdd1c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@@ -1899,9 -1875,9 +1899,9 @@@ static void get_tcp6_sock(struct seq_fi
  		   tp->write_seq-tp->snd_una,
  		   (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),
  		   timer_active,
 -		   jiffies_to_clock_t(timer_expires - jiffies),
 +		   jiffies_delta_to_clock_t(timer_expires - jiffies),
  		   icsk->icsk_retransmits,
- 		   sock_i_uid(sp),
+ 		   from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
  		   icsk->icsk_probes_out,
  		   sock_i_ino(sp),
  		   atomic_read(&sp->sk_refcnt), sp,