Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a9ad6a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9db90880 e9069f47

fs/btrfs/tree-log.c

+2 −2
Original line number Diff line number Diff line
@@ -2952,8 +2952,8 @@ static void fill_inode_item(struct btrfs_trans_handle *trans, 
			    struct btrfs_inode_item *item,

			    struct inode *inode, int log_inode_only)

{

	btrfs_set_inode_uid(leaf, item, inode->i_uid);

	btrfs_set_inode_gid(leaf, item, inode->i_gid);

	btrfs_set_inode_uid(leaf, item, i_uid_read(inode));

	btrfs_set_inode_gid(leaf, item, i_gid_read(inode));

	btrfs_set_inode_mode(leaf, item, inode->i_mode);

	btrfs_set_inode_nlink(leaf, item, inode->i_nlink);

fs/xattr_acl.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns( 
			break;

		case ACL_GROUP:

			gid = make_kgid(from, le32_to_cpu(entry->e_id));

			entry->e_id = cpu_to_le32(from_kuid(to, uid));

			entry->e_id = cpu_to_le32(from_kgid(to, gid));

			break;

		default:

			break;

net/bluetooth/af_bluetooth.c

+1 −1
Original line number Diff line number Diff line
@@ -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,