From ecd8bf5b78e5f357f6e14ba4aef03f746703e99b Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" Date: Fri, 10 Feb 2012 12:31:23 -0800 Subject: [PATCH] --- yaml --- r: 327291 b: refs/heads/master c: 305d3d0dbc22aa62fa4d8b9224826fd8c7104bc5 h: refs/heads/master i: 327289: 164e323f445e7e134987164cbd4f64d7e914f577 327287: fc6b2819763ac921eb9ec5fe0626cb96415ff04c v: v3 --- [refs] | 2 +- trunk/fs/nilfs2/inode.c | 8 ++++---- trunk/init/Kconfig | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e90cae6f8deb..b7bbed94c370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f303bdc55e9e74890eadc836c1edd8b5c21a7b89 +refs/heads/master: 305d3d0dbc22aa62fa4d8b9224826fd8c7104bc5 diff --git a/trunk/fs/nilfs2/inode.c b/trunk/fs/nilfs2/inode.c index 6e2c3db976b2..4d31d2cca7fd 100644 --- a/trunk/fs/nilfs2/inode.c +++ b/trunk/fs/nilfs2/inode.c @@ -401,8 +401,8 @@ int nilfs_read_inode_common(struct inode *inode, int err; inode->i_mode = le16_to_cpu(raw_inode->i_mode); - inode->i_uid = (uid_t)le32_to_cpu(raw_inode->i_uid); - inode->i_gid = (gid_t)le32_to_cpu(raw_inode->i_gid); + i_uid_write(inode, le32_to_cpu(raw_inode->i_uid)); + i_gid_write(inode, le32_to_cpu(raw_inode->i_gid)); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le64_to_cpu(raw_inode->i_size); inode->i_atime.tv_sec = le64_to_cpu(raw_inode->i_mtime); @@ -590,8 +590,8 @@ void nilfs_write_inode_common(struct inode *inode, struct nilfs_inode_info *ii = NILFS_I(inode); raw_inode->i_mode = cpu_to_le16(inode->i_mode); - raw_inode->i_uid = cpu_to_le32(inode->i_uid); - raw_inode->i_gid = cpu_to_le32(inode->i_gid); + raw_inode->i_uid = cpu_to_le32(i_uid_read(inode)); + raw_inode->i_gid = cpu_to_le32(i_gid_read(inode)); raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le64(inode->i_size); raw_inode->i_ctime = cpu_to_le64(inode->i_ctime.tv_sec); diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index c69e085ea810..90c9e06b66a5 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -949,7 +949,6 @@ config UIDGID_CONVERTED depends on NCP_FS = n depends on NFSD = n depends on NFS_FS = n - depends on NILFS2_FS = n depends on NTFS_FS = n depends on OCFS2_FS = n depends on OMFS_FS = n