From 8f04c409edf0ea56091833d565c8aebd61da6a10 Mon Sep 17 00:00:00 2001 From: Shirish Pargaonkar Date: Tue, 12 Feb 2008 20:46:26 +0000 Subject: [PATCH] --- yaml --- r: 86695 b: refs/heads/master c: d9f382eff6fbabcd09dad4558d1797c267e9746e h: refs/heads/master i: 86693: 1fd4e949fe6ac282159be207337b3510ca7ba407 86691: 10a1111addc4dc7345f7b7516144c92338f16a20 86687: f8dd06ab315f9bb5320836988f09dba0a7ff16f8 v: v3 --- [refs] | 2 +- trunk/fs/cifs/cifsacl.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8c30302cbf1a..76450d53dc5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f7e8f376360c789cf84a0321960dcef8bf92aff +refs/heads/master: d9f382eff6fbabcd09dad4558d1797c267e9746e diff --git a/trunk/fs/cifs/cifsacl.c b/trunk/fs/cifs/cifsacl.c index 49485108454f..f93932c21772 100644 --- a/trunk/fs/cifs/cifsacl.c +++ b/trunk/fs/cifs/cifsacl.c @@ -372,10 +372,6 @@ static void parse_dacl(struct cifs_acl *pdacl, char *end_of_acl, ppace = kmalloc(num_aces * sizeof(struct cifs_ace *), GFP_KERNEL); -/* cifscred->cecount = pdacl->num_aces; - cifscred->aces = kmalloc(num_aces * - sizeof(struct cifs_ace *), GFP_KERNEL);*/ - for (i = 0; i < num_aces; ++i) { ppace[i] = (struct cifs_ace *) (acl_base + acl_size); #ifdef CONFIG_CIFS_DEBUG2 @@ -428,7 +424,7 @@ static int set_chmod_dacl(struct cifs_acl *pndacl, struct cifs_sid *pownersid, &sid_everyone, nmode, S_IRWXO); pndacl->size = cpu_to_le16(size + sizeof(struct cifs_acl)); - pndacl->num_aces = 3; + pndacl->num_aces = cpu_to_le32(3); return (0); }