aboutsummaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/cifsacl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c
index 9c4a29690cca..b1f448f2e071 100644
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
@@ -115,8 +115,8 @@ int compare_sids(struct cifs_sid *ctsid, struct cifs_sid *cwsid)
115 } 115 }
116 116
117 /* compare all of the subauth values if any */ 117 /* compare all of the subauth values if any */
118 num_sat = cpu_to_le32(ctsid->num_subauth); 118 num_sat = ctsid->num_subauth;
119 num_saw = cpu_to_le32(cwsid->num_subauth); 119 num_saw = cwsid->num_subauth);
120 num_subauth = num_sat < num_saw ? num_sat : num_saw; 120 num_subauth = num_sat < num_saw ? num_sat : num_saw;
121 if (num_subauth) { 121 if (num_subauth) {
122 for (i = 0; i < num_subauth; ++i) { 122 for (i = 0; i < num_subauth; ++i) {
@@ -206,7 +206,7 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl)
206 acl_base = (char *)pdacl; 206 acl_base = (char *)pdacl;
207 acl_size = sizeof(struct cifs_acl); 207 acl_size = sizeof(struct cifs_acl);
208 208
209 num_aces = cpu_to_le32(pdacl->num_aces); 209 num_aces = le32_to_cpu(pdacl->num_aces);
210 if (num_aces > 0) { 210 if (num_aces > 0) {
211 ppntace = kmalloc(num_aces * sizeof(struct cifs_ntace *), 211 ppntace = kmalloc(num_aces * sizeof(struct cifs_ntace *),
212 GFP_KERNEL); 212 GFP_KERNEL);