Merge tag 'master-2012-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[~andy/linux] / fs / exofs / inode.c

diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c
index 1562c27a2fab27f700825e0090e4d98492fa2fbd..b5618104775187787415b67c1d99658f45f8b3d7 100644 (file)
--- a/fs/exofs/inode.c
+++ b/fs/exofs/inode.c
@@ -1172,8 +1172,8 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
 
        /* copy stuff from on-disk struct to in-memory struct */
        inode->i_mode = le16_to_cpu(fcb.i_mode);
-       inode->i_uid = le32_to_cpu(fcb.i_uid);
-       inode->i_gid = le32_to_cpu(fcb.i_gid);
+       i_uid_write(inode, le32_to_cpu(fcb.i_uid));
+       i_gid_write(inode, le32_to_cpu(fcb.i_gid));
        set_nlink(inode, le16_to_cpu(fcb.i_links_count));
        inode->i_ctime.tv_sec = (signed)le32_to_cpu(fcb.i_ctime);
        inode->i_atime.tv_sec = (signed)le32_to_cpu(fcb.i_atime);
@@ -1385,8 +1385,8 @@ static int exofs_update_inode(struct inode *inode, int do_sync)
        fcb = &args->fcb;
 
        fcb->i_mode = cpu_to_le16(inode->i_mode);
-       fcb->i_uid = cpu_to_le32(inode->i_uid);
-       fcb->i_gid = cpu_to_le32(inode->i_gid);
+       fcb->i_uid = cpu_to_le32(i_uid_read(inode));
+       fcb->i_gid = cpu_to_le32(i_gid_read(inode));
        fcb->i_links_count = cpu_to_le16(inode->i_nlink);
        fcb->i_ctime = cpu_to_le32(inode->i_ctime.tv_sec);
        fcb->i_atime = cpu_to_le32(inode->i_atime.tv_sec);