Skip to content

Commit 09a9ad6

Browse files
committed
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
2 parents 9db9088 + e9069f4 commit 09a9ad6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

fs/btrfs/tree-log.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2952,8 +2952,8 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
29522952
struct btrfs_inode_item *item,
29532953
struct inode *inode, int log_inode_only)
29542954
{
2955-
btrfs_set_inode_uid(leaf, item, inode->i_uid);
2956-
btrfs_set_inode_gid(leaf, item, inode->i_gid);
2955+
btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
2956+
btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
29572957
btrfs_set_inode_mode(leaf, item, inode->i_mode);
29582958
btrfs_set_inode_nlink(leaf, item, inode->i_nlink);
29592959

fs/xattr_acl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
4545
break;
4646
case ACL_GROUP:
4747
gid = make_kgid(from, le32_to_cpu(entry->e_id));
48-
entry->e_id = cpu_to_le32(from_kuid(to, uid));
48+
entry->e_id = cpu_to_le32(from_kgid(to, gid));
4949
break;
5050
default:
5151
break;

net/bluetooth/af_bluetooth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
591591
atomic_read(&sk->sk_refcnt),
592592
sk_rmem_alloc_get(sk),
593593
sk_wmem_alloc_get(sk),
594-
sock_i_uid(sk),
594+
from_kuid(seq_user_ns(seq), sock_i_uid(sk)),
595595
sock_i_ino(sk),
596596
&src_baswapped,
597597
&dst_baswapped,

0 commit comments

Comments
 (0)