cifs: use the NUM_AUTHS and NUM_SUBAUTHS constants in cifsacl code

...instead of hardcoding in '5' and '6' all over the place.

Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index d35579a1640a3ed72ffa09ee9f228e6779e0d8b8..18437c5561fef53d9e305f88890f6b4e8047604f 100644 (file)
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -210,7 +210,7 @@ sid_to_str(struct cifs_sid *sidptr, char *sidstr)
        sprintf(strptr, "-%d", sidptr->revision);
        strptr = sidstr + strlen(sidstr);
 
-       for (i = 0; i < 6; ++i) {
+       for (i = 0; i < NUM_AUTHS; ++i) {
                if (sidptr->authority[i]) {
                        sprintf(strptr, "-%d", sidptr->authority[i]);
                        strptr = sidstr + strlen(sidstr);
@@ -649,7 +649,7 @@ int compare_sids(const struct cifs_sid *ctsid, const struct cifs_sid *cwsid)
        }
 
        /* compare all of the six auth values */
-       for (i = 0; i < 6; ++i) {
+       for (i = 0; i < NUM_AUTHS; ++i) {
                if (ctsid->authority[i] != cwsid->authority[i]) {
                        if (ctsid->authority[i] > cwsid->authority[i])
                                return 1;
@@ -811,7 +811,7 @@ static __u16 fill_ace_for_sid(struct cifs_ace *pntace,
 
        pntace->sid.revision = psid->revision;
        pntace->sid.num_subauth = psid->num_subauth;
-       for (i = 0; i < 6; i++)
+       for (i = 0; i < NUM_AUTHS; i++)
                pntace->sid.authority[i] = psid->authority[i];
        for (i = 0; i < psid->num_subauth; i++)
                pntace->sid.sub_auth[i] = psid->sub_auth[i];

diff --git a/fs/cifs/cifsacl.h b/fs/cifs/cifsacl.h
index 5c902c7ce5247a8df78db13072c0c7941e964086..80e0d66a403d49972bcb5dc6d066cd2ed4548133 100644 (file)
--- a/fs/cifs/cifsacl.h
+++ b/fs/cifs/cifsacl.h
@@ -60,8 +60,8 @@ struct cifs_ntsd {
 struct cifs_sid {
        __u8 revision; /* revision level */
        __u8 num_subauth;
-       __u8 authority[6];
-       __le32 sub_auth[5]; /* sub_auth[num_subauth] */
+       __u8 authority[NUM_AUTHS];
+       __le32 sub_auth[NUM_SUBAUTHS]; /* sub_auth[num_subauth] */
 } __attribute__((packed));
 
 struct cifs_acl {