aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-09-06 18:16:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:19 -0400
commit202e5979af4d91c7ca05892641131dee22653259 (patch)
treeba8443571add62bc93d29c1f6a3575381cccd167 /fs
parent8dbfc5cfdcac04d656f6f6789eb8fcdcc3d2dfda (diff)
[PATCH] compat: be more consistent about [ug]id_t
When I first wrote the compat layer patches, I was somewhat cavalier about the definition of compat_uid_t and compat_gid_t (or maybe I just misunderstood :-)). This patch makes the compat types much more consistent with the types we are being compatible with and hopefully will fix a few bugs along the way. compat type type in compat arch __compat_[ug]id_t __kernel_[ug]id_t __compat_[ug]id32_t __kernel_[ug]id32_t compat_[ug]id_t [ug]id_t The difference is that compat_uid_t is always 32 bits (for the archs we care about) but __compat_uid_t may be 16 bits on some. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/compat.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/compat.c b/fs/compat.c
index 6b06b6bae35e..8e03d31eec3b 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -720,14 +720,14 @@ compat_sys_io_submit(aio_context_t ctx_id, int nr, u32 __user *iocb)
720struct compat_ncp_mount_data { 720struct compat_ncp_mount_data {
721 compat_int_t version; 721 compat_int_t version;
722 compat_uint_t ncp_fd; 722 compat_uint_t ncp_fd;
723 compat_uid_t mounted_uid; 723 __compat_uid_t mounted_uid;
724 compat_pid_t wdog_pid; 724 compat_pid_t wdog_pid;
725 unsigned char mounted_vol[NCP_VOLNAME_LEN + 1]; 725 unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
726 compat_uint_t time_out; 726 compat_uint_t time_out;
727 compat_uint_t retry_count; 727 compat_uint_t retry_count;
728 compat_uint_t flags; 728 compat_uint_t flags;
729 compat_uid_t uid; 729 __compat_uid_t uid;
730 compat_gid_t gid; 730 __compat_gid_t gid;
731 compat_mode_t file_mode; 731 compat_mode_t file_mode;
732 compat_mode_t dir_mode; 732 compat_mode_t dir_mode;
733}; 733};
@@ -784,9 +784,9 @@ static void *do_ncp_super_data_conv(void *raw_data)
784 784
785struct compat_smb_mount_data { 785struct compat_smb_mount_data {
786 compat_int_t version; 786 compat_int_t version;
787 compat_uid_t mounted_uid; 787 __compat_uid_t mounted_uid;
788 compat_uid_t uid; 788 __compat_uid_t uid;
789 compat_gid_t gid; 789 __compat_gid_t gid;
790 compat_mode_t file_mode; 790 compat_mode_t file_mode;
791 compat_mode_t dir_mode; 791 compat_mode_t dir_mode;
792}; 792};
@@ -1808,8 +1808,8 @@ struct compat_nfsctl_export {
1808 compat_dev_t ex32_dev; 1808 compat_dev_t ex32_dev;
1809 compat_ino_t ex32_ino; 1809 compat_ino_t ex32_ino;
1810 compat_int_t ex32_flags; 1810 compat_int_t ex32_flags;
1811 compat_uid_t ex32_anon_uid; 1811 __compat_uid_t ex32_anon_uid;
1812 compat_gid_t ex32_anon_gid; 1812 __compat_gid_t ex32_anon_gid;
1813}; 1813};
1814 1814
1815struct compat_nfsctl_fdparm { 1815struct compat_nfsctl_fdparm {