diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 13:23:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 13:23:39 -0700 |
| commit | 09a9ad6a1ff86836e5280c39300176c4758bb459 (patch) | |
| tree | 27967b60cbb53def07f4ceb8365efb8206c2a777 /net | |
| parent | 9db908806b85c1430150fbafe269a7b21b07d15d (diff) | |
| parent | e9069f470803eeb5e243a05bc717452c6218bd71 (diff) | |
| download | op-kernel-dev-09a9ad6a1ff86836e5280c39300176c4758bb459.zip op-kernel-dev-09a9ad6a1ff86836e5280c39300176c4758bb459.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull user namespace compile fixes from Eric W Biederman:
"This tree contains three trivial fixes. One compiler warning, one
thinko fix, and one build fix"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
btrfs: Fix compilation with user namespace support enabled
userns: Fix posix_acl_file_xattr_userns gid conversion
userns: Properly print bluetooth socket uids
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 9d49ee6..ba033f0 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -591,7 +591,7 @@ static int bt_seq_show(struct seq_file *seq, void *v) atomic_read(&sk->sk_refcnt), sk_rmem_alloc_get(sk), sk_wmem_alloc_get(sk), - sock_i_uid(sk), + from_kuid(seq_user_ns(seq), sock_i_uid(sk)), sock_i_ino(sk), &src_baswapped, &dst_baswapped, |
