[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:
committed by
Linus Torvalds
parent
8dbfc5cfdc
commit
202e5979af
@ -546,20 +546,20 @@ struct msgbuf32 { s32 mtype; char mtext[1]; };
|
||||
struct ipc_perm32
|
||||
{
|
||||
key_t key;
|
||||
compat_uid_t uid;
|
||||
compat_gid_t gid;
|
||||
compat_uid_t cuid;
|
||||
compat_gid_t cgid;
|
||||
__compat_uid_t uid;
|
||||
__compat_gid_t gid;
|
||||
__compat_uid_t cuid;
|
||||
__compat_gid_t cgid;
|
||||
compat_mode_t mode;
|
||||
unsigned short seq;
|
||||
};
|
||||
|
||||
struct ipc64_perm32 {
|
||||
key_t key;
|
||||
compat_uid_t uid;
|
||||
compat_gid_t gid;
|
||||
compat_uid_t cuid;
|
||||
compat_gid_t cgid;
|
||||
__compat_uid_t uid;
|
||||
__compat_gid_t gid;
|
||||
__compat_uid_t cuid;
|
||||
__compat_gid_t cgid;
|
||||
compat_mode_t mode;
|
||||
unsigned short seq;
|
||||
unsigned short __pad1;
|
||||
|
Reference in New Issue
Block a user