summaryrefslogtreecommitdiffstats
path: root/fs/efs
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-16 01:07:24 +0000
commit95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch)
tree27a92a942821cde1edda9a1b088718d436b3efe4 /fs/efs
parent45b27b0a0652331d104c953a5b192d843fff88f8 (diff)
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/efs')
-rw-r--r--fs/efs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/efs/inode.c b/fs/efs/inode.c
index 7ed3db6ad..75903be12 100644
--- a/fs/efs/inode.c
+++ b/fs/efs/inode.c
@@ -70,8 +70,8 @@ void efs_read_inode(struct inode *inode) {
inode->i_mode = be16_to_cpu(efs_inode->di_mode);
inode->i_nlink = be16_to_cpu(efs_inode->di_nlink);
- inode->i_uid = be16_to_cpu(efs_inode->di_uid);
- inode->i_gid = be16_to_cpu(efs_inode->di_gid);
+ inode->i_uid = (uid_t)be16_to_cpu(efs_inode->di_uid);
+ inode->i_gid = (gid_t)be16_to_cpu(efs_inode->di_gid);
inode->i_size = be32_to_cpu(efs_inode->di_size);
inode->i_atime = be32_to_cpu(efs_inode->di_atime);
inode->i_mtime = be32_to_cpu(efs_inode->di_mtime);