aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-02-10 14:05:07 -0500
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 06:13:31 -0400
commit2f2f43d3c7b1da8dba56716dd1be196b6f57bf9b (patch)
treed1740a461274c8119dbf8e261a75c63095ee740a /fs/btrfs/inode.c
parent7f5b82b835ee62b365f39373e35162eb7a072c5f (diff)
userns: Convert btrfs to use kuid/kgid where appropriate
Cc: Chris Mason <chris.mason@fusionio.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 83baec24946d..53687149c077 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2570,8 +2570,8 @@ static void btrfs_read_locked_inode(struct inode *inode)
2570 struct btrfs_inode_item); 2570 struct btrfs_inode_item);
2571 inode->i_mode = btrfs_inode_mode(leaf, inode_item); 2571 inode->i_mode = btrfs_inode_mode(leaf, inode_item);
2572 set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); 2572 set_nlink(inode, btrfs_inode_nlink(leaf, inode_item));
2573 inode->i_uid = btrfs_inode_uid(leaf, inode_item); 2573 i_uid_write(inode, btrfs_inode_uid(leaf, inode_item));
2574 inode->i_gid = btrfs_inode_gid(leaf, inode_item); 2574 i_gid_write(inode, btrfs_inode_gid(leaf, inode_item));
2575 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); 2575 btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item));
2576 2576
2577 tspec = btrfs_inode_atime(inode_item); 2577 tspec = btrfs_inode_atime(inode_item);
@@ -2649,8 +2649,8 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
2649 struct btrfs_inode_item *item, 2649 struct btrfs_inode_item *item,
2650 struct inode *inode) 2650 struct inode *inode)
2651{ 2651{
2652 btrfs_set_inode_uid(leaf, item, inode->i_uid); 2652 btrfs_set_inode_uid(leaf, item, i_uid_read(inode));
2653 btrfs_set_inode_gid(leaf, item, inode->i_gid); 2653 btrfs_set_inode_gid(leaf, item, i_gid_read(inode));
2654 btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size); 2654 btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size);
2655 btrfs_set_inode_mode(leaf, item, inode->i_mode); 2655 btrfs_set_inode_mode(leaf, item, inode->i_mode);
2656 btrfs_set_inode_nlink(leaf, item, inode->i_nlink); 2656 btrfs_set_inode_nlink(leaf, item, inode->i_nlink);