[CIFS] change misleading field name

num_auth is really num_subauth in ACL terminology

Signed-off-by: Steve French <sfrench@us.ibm.com>

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 90969104dd39c334c0e308796a2b7d2d0d2508fe..9b84f373af19ba63e5525d3987fbafc2f5cbec8f 100644 (file)
--- 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 b975ae113037a3a1b607fd10a68e4359e3cff274..5e7b56738cc5b72d0d54e4facaddebfe860fc7c5 100644 (file)
--- 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 */