From 9be167cb869bc997ae261e4e24c0a8f318f529d4 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Sun, 25 Nov 2012 08:00:35 -0500 Subject: [PATCH] --- yaml --- r: 339453 b: refs/heads/master c: fc03d8a5a18172ebdb2402cc355abb8fd3cbb844 h: refs/heads/master i: 339451: 76db9c8ff5beced778cf7390e1a01f2340103213 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsacl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f496cb166922..b4affdd99523 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c78cd83805d43198e1ef452fba27fa049db6387f +refs/heads/master: fc03d8a5a18172ebdb2402cc355abb8fd3cbb844 diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c index b45ec7426ae3..d35579a1640a 100644 --- a/trunk/fs/cifs/cifsacl.c +++ b/trunk/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; }