On Tue, Oct 16, 2012 at 6:26 AM, Jeff Layton <jlayton@xxxxxxxxxx> wrote:
> ...instead of hardcoding in '5' and '6' all over the place.
>
> Cc: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> fs/cifs/cifsacl.c | 6 +++---
> fs/cifs/cifsacl.h | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
> index eddadcd..9819aa8 100644
> --- 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 5c902c7..80e0d66 100644
> --- 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 {
> --
> 1.7.11.7
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks correct.
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@xxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
