diff options
author | Jeff Layton <jlayton@redhat.com> | 2012-11-25 08:00:35 -0500 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2012-12-05 14:13:10 -0500 |
commit | fc03d8a5a18172ebdb2402cc355abb8fd3cbb844 (patch) | |
tree | 8f792c0da710860fce768eddd97538fdc8144e9d /fs/cifs | |
parent | c78cd83805d43198e1ef452fba27fa049db6387f (diff) |
cifs: move num_subauth check inside of CONFIG_CIFS_DEBUG2 check in parse_sid()
Reviewed-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Diffstat (limited to 'fs/cifs')
-rw-r--r-- | fs/cifs/cifsacl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index b45ec7426ae3..d35579a1640a 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) | |||
987 | return -EINVAL; | 987 | return -EINVAL; |
988 | } | 988 | } |
989 | 989 | ||
990 | if (psid->num_subauth) { | ||
991 | #ifdef CONFIG_CIFS_DEBUG2 | 990 | #ifdef CONFIG_CIFS_DEBUG2 |
991 | if (psid->num_subauth) { | ||
992 | int i; | 992 | int i; |
993 | cFYI(1, "SID revision %d num_auth %d", | 993 | cFYI(1, "SID revision %d num_auth %d", |
994 | psid->revision, psid->num_subauth); | 994 | psid->revision, psid->num_subauth); |
@@ -1002,8 +1002,8 @@ static int parse_sid(struct cifs_sid *psid, char *end_of_acl) | |||
1002 | num auths and therefore go off the end */ | 1002 | num auths and therefore go off the end */ |
1003 | cFYI(1, "RID 0x%x", | 1003 | cFYI(1, "RID 0x%x", |
1004 | le32_to_cpu(psid->sub_auth[psid->num_subauth-1])); | 1004 | le32_to_cpu(psid->sub_auth[psid->num_subauth-1])); |
1005 | #endif | ||
1006 | } | 1005 | } |
1006 | #endif | ||
1007 | 1007 | ||
1008 | return 0; | 1008 | return 0; |
1009 | } | 1009 | } |