From 8f22960957ba364264a7f5011e19bfdef621cc90 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 12 Oct 2007 18:54:12 +0000 Subject: [PATCH] --- yaml --- r: 71571 b: refs/heads/master c: 8f18c1316b71df76bb7076c392134864a18636c1 h: refs/heads/master i: 71569: defd23a42c1e75422e8b0c28dad3a7f1054d7e3f 71567: dd229542c96c26126269034d300668b58f3b208e v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsacl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f295b185920..7ab95b429fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 297647c21f11dc1449f9bdb1601ae43e951bba0b +refs/heads/master: 8f18c1316b71df76bb7076c392134864a18636c1 diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c index 43ab26fff398..601587724f9d 100644 --- a/trunk/fs/cifs/cifsacl.c +++ b/trunk/fs/cifs/cifsacl.c @@ -131,7 +131,6 @@ int compare_sids(struct cifs_sid *ctsid, struct cifs_sid *cwsid) static void parse_ace(struct cifs_ace *pace, char *end_of_acl) { - int i; int num_subauth; /* validate that we do not go past end of acl */ @@ -145,6 +144,7 @@ static void parse_ace(struct cifs_ace *pace, char *end_of_acl) num_subauth = cpu_to_le32(pace->num_subauth); if (num_subauth) { #ifdef CONFIG_CIFS_DEBUG2 + int i; cFYI(1, ("ACE revision %d num_subauth %d", pace->revision, pace->num_subauth)); for (i = 0; i < num_subauth; ++i) { @@ -255,7 +255,6 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl) static int parse_sid(struct cifs_sid *psid, char *end_of_acl) { - int i; int num_subauth; /* BB need to add parm so we can store the SID BB */ @@ -269,6 +268,7 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) num_subauth = cpu_to_le32(psid->num_subauth); if (num_subauth) { #ifdef CONFIG_CIFS_DEBUG2 + int i; cFYI(1, ("SID revision %d num_auth %d First subauth 0x%x", psid->revision, psid->num_subauth, psid->sub_auth[0]));