diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-01 19:59:01 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-01 19:59:01 +0000 |
| commit | 4084973dbae9a24e58598d6cdf60f0e5e4a3cabf (patch) | |
| tree | 39ffde1dc1e7de75facc58485ef9c02a0227973b | |
| parent | 92ad9b93cd268371d1fc0edbd09383cc1c59be34 (diff) | |
| download | op-kernel-dev-4084973dbae9a24e58598d6cdf60f0e5e4a3cabf.zip op-kernel-dev-4084973dbae9a24e58598d6cdf60f0e5e4a3cabf.tar.gz | |
[CIFS] change misleading field name
num_auth is really num_subauth in ACL terminology
Signed-off-by: Steve French <sfrench@us.ibm.com>
| -rw-r--r-- | fs/cifs/cifsacl.c | 4 | ||||
| -rw-r--r-- | fs/cifs/cifsacl.h | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 9096910..9b84f37 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -46,11 +46,11 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) } #ifdef CONFIG_CIFS_DEBUG2 cFYI(1, ("revision %d num_auth %d First subauth 0x%x", - psid->revision, psid->num_auth, psid->sub_auth[0])); + psid->revision, psid->num_subauth, psid->sub_auth[0])); /* BB add length check to make sure that we do not have huge num auths and therefore go off the end */ - cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_auth]))); + cFYI(1, ("RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_subauth]))); #endif return 0; } diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h index b975ae1..5e7b567 100644 --- a/fs/cifs/cifsacl.h +++ b/fs/cifs/cifsacl.h @@ -33,10 +33,9 @@ struct cifs_ntsd { struct cifs_sid { __u8 revision; /* revision level */ - __u8 num_auth; + __u8 num_subauth; __u8 authority[6]; - __u32 sub_auth[4]; - __u32 rid; + __u32 sub_auth[0]; /* sub_auth[num_subauth] */ } __attribute__((packed)); struct cifs_acl { @@ -54,10 +53,9 @@ struct cifs_ntace { struct cifs_ace { __u8 revision; /* revision level */ - __u8 num_auth; + __u8 num_subauth; __u8 authority[6]; - __u32 sub_auth[4]; - __u32 rid; + __u32 sub_auth[0]; } __attribute__((packed)); /* everyone */ |
