summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-01 19:59:01 +0000
committerSteve French <sfrench@us.ibm.com>2007-10-01 19:59:01 +0000
commit4084973dbae9a24e58598d6cdf60f0e5e4a3cabf (patch)
tree39ffde1dc1e7de75facc58485ef9c02a0227973b /fs/cifs
parent92ad9b93cd268371d1fc0edbd09383cc1c59be34 (diff)
[CIFS] change misleading field name
num_auth is really num_subauth in ACL terminology Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsacl.c4
-rw-r--r--fs/cifs/cifsacl.h10
2 files changed, 6 insertions, 8 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 90969104dd3..9b84f373af1 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 b975ae11303..5e7b56738cc 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 */