From: Jeff Layton Date: Sun, 25 Nov 2012 13:00:35 +0000 (-0500) Subject: cifs: move num_subauth check inside of CONFIG_CIFS_DEBUG2 check in parse_sid() X-Git-Tag: upstream/snapshot3+hdmi~6105^2~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc03d8a5a18172ebdb2402cc355abb8fd3cbb844;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git cifs: move num_subauth check inside of CONFIG_CIFS_DEBUG2 check in parse_sid() Reviewed-by: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French --- diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index b45ec74..d35579a 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c @@ -987,8 +987,8 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) return -EINVAL; } - if (psid->num_subauth) { #ifdef CONFIG_CIFS_DEBUG2 + if (psid->num_subauth) { int i; cFYI(1, "SID revision %d num_auth %d", psid->revision, psid->num_subauth); @@ -1002,8 +1002,8 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) num auths and therefore go off the end */ cFYI(1, "RID 0x%x", le32_to_cpu(psid->sub_auth[psid->num_subauth-1])); -#endif } +#endif return 0; }