From: Steve French <sfrench@us.ibm.com>
Date: Mon, 1 Oct 2007 19:59:01 +0000 (+0000)
Subject: [CIFS] change misleading field name
X-Git-Tag: firefly_0821_release~24754^2~25
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4084973dbae9a24e58598d6cdf60f0e5e4a3cabf;p=firefly-linux-kernel-4.4.55.git

[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 90969104dd39..9b84f373af19 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 b975ae113037..5e7b56738cc5 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 */