diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /fs/sysv | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'fs/sysv')
| -rw-r--r-- | fs/sysv/inode.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c index 6cd146dbd..cfe016728 100644 --- a/fs/sysv/inode.c +++ b/fs/sysv/inode.c @@ -33,6 +33,7 @@ #include <linux/locks.h> #include <linux/init.h> #include <linux/smp_lock.h> +#include <linux/highuid.h> #include <asm/byteorder.h> #include <asm/uaccess.h> @@ -1032,8 +1033,8 @@ static void sysv_read_inode(struct inode *inode) mode = from_coh_imode(mode); /* SystemV FS: kludge permissions if ino==SYSV_ROOT_INO ?? */ inode->i_mode = mode; - inode->i_uid = raw_inode->i_uid; - inode->i_gid = raw_inode->i_gid; + inode->i_uid = (uid_t)raw_inode->i_uid; + inode->i_gid = (gid_t)raw_inode->i_gid; inode->i_nlink = raw_inode->i_nlink; if (sb->sv_convert) { inode->i_size = from_coh_ulong(raw_inode->i_size); @@ -1113,8 +1114,8 @@ static struct buffer_head * sysv_update_inode(struct inode * inode) if (sb->sv_kludge_symlinks) mode = to_coh_imode(mode); raw_inode->i_mode = mode; - raw_inode->i_uid = inode->i_uid; - raw_inode->i_gid = inode->i_gid; + raw_inode->i_uid = fs_high2lowuid(inode->i_uid); + raw_inode->i_gid = fs_high2lowgid(inode->i_gid); raw_inode->i_nlink = inode->i_nlink; if (sb->sv_convert) { raw_inode->i_size = to_coh_ulong(inode->i_size); |