mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
[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>
This commit is contained in:
parent
8dbfc5cfdc
commit
202e5979af
11 changed files with 87 additions and 76 deletions
16
fs/compat.c
16
fs/compat.c
|
@ -720,14 +720,14 @@ compat_sys_io_submit(aio_context_t ctx_id, int nr, u32 __user *iocb)
|
|||
struct compat_ncp_mount_data {
|
||||
compat_int_t version;
|
||||
compat_uint_t ncp_fd;
|
||||
compat_uid_t mounted_uid;
|
||||
__compat_uid_t mounted_uid;
|
||||
compat_pid_t wdog_pid;
|
||||
unsigned char mounted_vol[NCP_VOLNAME_LEN + 1];
|
||||
compat_uint_t time_out;
|
||||
compat_uint_t retry_count;
|
||||
compat_uint_t flags;
|
||||
compat_uid_t uid;
|
||||
compat_gid_t gid;
|
||||
__compat_uid_t uid;
|
||||
__compat_gid_t gid;
|
||||
compat_mode_t file_mode;
|
||||
compat_mode_t dir_mode;
|
||||
};
|
||||
|
@ -784,9 +784,9 @@ static void *do_ncp_super_data_conv(void *raw_data)
|
|||
|
||||
struct compat_smb_mount_data {
|
||||
compat_int_t version;
|
||||
compat_uid_t mounted_uid;
|
||||
compat_uid_t uid;
|
||||
compat_gid_t gid;
|
||||
__compat_uid_t mounted_uid;
|
||||
__compat_uid_t uid;
|
||||
__compat_gid_t gid;
|
||||
compat_mode_t file_mode;
|
||||
compat_mode_t dir_mode;
|
||||
};
|
||||
|
@ -1808,8 +1808,8 @@ struct compat_nfsctl_export {
|
|||
compat_dev_t ex32_dev;
|
||||
compat_ino_t ex32_ino;
|
||||
compat_int_t ex32_flags;
|
||||
compat_uid_t ex32_anon_uid;
|
||||
compat_gid_t ex32_anon_gid;
|
||||
__compat_uid_t ex32_anon_uid;
|
||||
__compat_gid_t ex32_anon_gid;
|
||||
};
|
||||
|
||||
struct compat_nfsctl_fdparm {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue