Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4084973dbae9a24e58598d6cdf60f0e5e4a3cabf
Commit:     4084973dbae9a24e58598d6cdf60f0e5e4a3cabf
Parent:     92ad9b93cd268371d1fc0edbd09383cc1c59be34
Author:     Steve French <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 1 19:59:01 2007 +0000
Committer:  Steve French <[EMAIL PROTECTED]>
CommitDate: Mon Oct 1 19:59:01 2007 +0000

    [CIFS] change misleading field name
    
    num_auth is really num_subauth in ACL terminology
    
    Signed-off-by: Steve French <[EMAIL PROTECTED]>
---
 fs/cifs/cifsacl.c |    4 ++--
 fs/cifs/cifsacl.h |   10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 9096910..9b84f37 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 b975ae1..5e7b567 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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to