Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Browse Source 
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
This commit is contained in:
Linus Torvalds 2012-10-13 13:23:39 -07:00
commit 09a9ad6a1f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/tree-log.c
View File

@ -2952,8 +2952,8 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
struct btrfs_inode_item *item, struct btrfs_inode_item *item,
struct inode *inode, int log_inode_only) struct inode *inode, int log_inode_only)
{ {
btrfs_set_inode_uid(leaf, item, inode->i_uid); btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
btrfs_set_inode_gid(leaf, item, inode->i_gid); btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
btrfs_set_inode_mode(leaf, item, inode->i_mode); btrfs_set_inode_mode(leaf, item, inode->i_mode);
btrfs_set_inode_nlink(leaf, item, inode->i_nlink); btrfs_set_inode_nlink(leaf, item, inode->i_nlink);

2
fs/xattr_acl.c
View File

@ -45,7 +45,7 @@ static void posix_acl_fix_xattr_userns(
break; break;
case ACL_GROUP: case ACL_GROUP:
gid = make_kgid(from, le32_to_cpu(entry->e_id)); 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; break;
default: default:
break; break;

2
net/bluetooth/af_bluetooth.c
View File

@ -591,7 +591,7 @@ static int bt_seq_show(struct seq_file *seq, void *v)
atomic_read(&sk->sk_refcnt), atomic_read(&sk->sk_refcnt),
sk_rmem_alloc_get(sk), sk_rmem_alloc_get(sk),
sk_wmem_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), sock_i_ino(sk),
&src_baswapped, &src_baswapped,
&dst_baswapped, &dst_baswapped,