tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 09a9ad6a 9db90880

+4 -4
+2 -2
fs/btrfs/tree-log.c
··· 2952 2952 struct btrfs_inode_item *item, 2953 2953 struct inode *inode, int log_inode_only) 2954 2954 { 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)); 2957 2957 btrfs_set_inode_mode(leaf, item, inode->i_mode); 2958 2958 btrfs_set_inode_nlink(leaf, item, inode->i_nlink); 2959 2959
+1 -1
fs/xattr_acl.c
··· 45 45 break; 46 46 case ACL_GROUP: 47 47 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)); 49 49 break; 50 50 default: 51 51 break;
+1 -1
net/bluetooth/af_bluetooth.c
··· 591 591 atomic_read(&sk->sk_refcnt), 592 592 sk_rmem_alloc_get(sk), 593 593 sk_wmem_alloc_get(sk), 594 - sock_i_uid(sk), 594 + from_kuid(seq_user_ns(seq), sock_i_uid(sk)), 595 595 sock_i_ino(sk), 596 596 &src_baswapped, 597 597 &dst_baswapped,