diff options
author | Steve French <sfrench@us.ibm.com> | 2007-10-16 14:40:37 -0400 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2007-10-16 14:40:37 -0400 |
commit | af6f4612fdfd782c6d35272836a2b97e7e5b790e (patch) | |
tree | 6456435d2c845c43b0094473c6248ab59e7284b3 /fs/cifs/cifsacl.h | |
parent | 016ec75f1a0c0e765fce65d794569979104f031d (diff) |
[CIFS] Fix some endianness problems in new acl code
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs/cifsacl.h')
-rw-r--r-- | fs/cifs/cifsacl.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index 0362cd11f03e..fa01053fc5fa 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h | |||
@@ -27,25 +27,25 @@ | |||
27 | #define SIDNAMELENGTH 20 /* long enough for the ones we care about */ | 27 | #define SIDNAMELENGTH 20 /* long enough for the ones we care about */ |
28 | 28 | ||
29 | struct cifs_ntsd { | 29 | struct cifs_ntsd { |
30 | __u16 revision; /* revision level */ | 30 | __le16 revision; /* revision level */ |
31 | __u16 type; | 31 | __le16 type; |
32 | __u32 osidoffset; | 32 | __le32 osidoffset; |
33 | __u32 gsidoffset; | 33 | __le32 gsidoffset; |
34 | __u32 sacloffset; | 34 | __le32 sacloffset; |
35 | __u32 dacloffset; | 35 | __le32 dacloffset; |
36 | } __attribute__((packed)); | 36 | } __attribute__((packed)); |
37 | 37 | ||
38 | struct cifs_sid { | 38 | struct cifs_sid { |
39 | __u8 revision; /* revision level */ | 39 | __u8 revision; /* revision level */ |
40 | __u8 num_subauth; | 40 | __u8 num_subauth; |
41 | __u8 authority[6]; | 41 | __u8 authority[6]; |
42 | __u32 sub_auth[5]; /* sub_auth[num_subauth] */ | 42 | __le32 sub_auth[5]; /* sub_auth[num_subauth] */ /* BB FIXME endianness BB */ |
43 | } __attribute__((packed)); | 43 | } __attribute__((packed)); |
44 | 44 | ||
45 | struct cifs_acl { | 45 | struct cifs_acl { |
46 | __u16 revision; /* revision level */ | 46 | __le16 revision; /* revision level */ |
47 | __u16 size; | 47 | __le16 size; |
48 | __u32 num_aces; | 48 | __le32 num_aces; |
49 | } __attribute__((packed)); | 49 | } __attribute__((packed)); |
50 | 50 | ||
51 | struct cifs_ntace { /* first part of ACE which contains perms */ | 51 | struct cifs_ntace { /* first part of ACE which contains perms */ |
@@ -59,7 +59,7 @@ struct cifs_ace { /* last part of ACE which includes user info */ | |||
59 | __u8 revision; /* revision level */ | 59 | __u8 revision; /* revision level */ |
60 | __u8 num_subauth; | 60 | __u8 num_subauth; |
61 | __u8 authority[6]; | 61 | __u8 authority[6]; |
62 | __u32 sub_auth[5]; | 62 | __le32 sub_auth[5]; |
63 | } __attribute__((packed)); | 63 | } __attribute__((packed)); |
64 | 64 | ||
65 | struct cifs_wksid { | 65 | struct cifs_wksid { |
@@ -69,7 +69,6 @@ struct cifs_wksid { | |||
69 | 69 | ||
70 | #ifdef CONFIG_CIFS_EXPERIMENTAL | 70 | #ifdef CONFIG_CIFS_EXPERIMENTAL |
71 | 71 | ||
72 | extern struct cifs_wksid wksidarr[NUM_WK_SIDS]; | ||
73 | extern int match_sid(struct cifs_sid *); | 72 | extern int match_sid(struct cifs_sid *); |
74 | extern int compare_sids(struct cifs_sid *, struct cifs_sid *); | 73 | extern int compare_sids(struct cifs_sid *, struct cifs_sid *); |
75 | 74 | ||