From 9a5faf77ccbc16bef0ec2e26f688fb0680f81fbb Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 17 Jul 2007 04:04:36 -0700 Subject: [PATCH] --- yaml --- r: 60823 b: refs/heads/master c: f7fede4b27bfc6c987d6da8e40384b1b098830bb h: refs/heads/master i: 60821: 069eba3268d99a10b02c2d7355aee2266ebf4cf7 60819: 26cd90017bd834a79c73e17634f1050eacb3051d 60815: ed37d1468b4b0d9b36bf2c4bf48116b6623e6436 v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4acl.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dea479df3703..8b2e2722194f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33a1060ae7dc671a0208b341bd454009625bb5a6 +refs/heads/master: f7fede4b27bfc6c987d6da8e40384b1b098830bb diff --git a/trunk/fs/nfsd/nfs4acl.c b/trunk/fs/nfsd/nfs4acl.c index cc3b7badd486..4adb5ee4759b 100644 --- a/trunk/fs/nfsd/nfs4acl.c +++ b/trunk/fs/nfsd/nfs4acl.c @@ -183,8 +183,13 @@ static void summarize_posix_acl(struct posix_acl *acl, struct posix_acl_summary *pas) { struct posix_acl_entry *pa, *pe; - pas->users = 0; - pas->groups = 0; + + /* + * Only pas.users and pas.groups need initialization; previous + * posix_acl_valid() calls ensure that the other fields will be + * initialized in the following loop. But, just to placate gcc: + */ + memset(pas, 0, sizeof(*pas)); pas->mask = 07; pe = acl->a_entries + acl->a_count;