summaryrefslogtreecommitdiffstats
path: root/xlators/nfs/server/src/acl3.c
diff options
context:
space:
mode:
authorSantosh Kumar Pradhan <spradhan@redhat.com>2013-11-21 17:13:58 +0530
committerVijay Bellur <vbellur@redhat.com>2013-11-25 05:40:57 -0800
commitb87d96b97d4a0cdc0883bec8ea8b4730b82fb3ba (patch)
treef972fcedd615f6c6acf81ed4edcf486bfa2d9881 /xlators/nfs/server/src/acl3.c
parent07a3b04d5ce1d7a22a4ce01f1b6b8f8fc6ffbb05 (diff)
gNFS: More clean up for Gluster NFS
1) Fix the typo in NFS default ACL The typo was introduced as part of the Fix to BZ 1009210 i.e. http://review.gluster.org/5980. The user ACL xattr structure was passed to default ACL xattr. 2) Clean up NFS code to avoid unnecessary SEGV in rpcsvc_drc_reconfigure() which was not validating the svc->drc. Add a routine rpcsvc_drc_deinit() to handle the clean up of DRC specific data structures. For init(), use rpcsvc_drc_init(). 3) nfs_init_state() was returning wrong value even if the registration with portmapper failed, causing the NFS server process to hang around. As a result it used to get SEGV during rpcsvc_drc_reconfigure(). 4) Clean up memfactor usage across nfs.c nfs3.c. Change-Id: I5cea26cb68dd8a822ec0ae104952f67fe63fa703 BUG: 1009210 Signed-off-by: Santosh Kumar Pradhan <spradhan@redhat.com> Reviewed-on: http://review.gluster.org/6329 Reviewed-by: Rajesh Joseph <rjoseph@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators/nfs/server/src/acl3.c')
-rw-r--r--xlators/nfs/server/src/acl3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index 08b099b4e60..a9843c7108b 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -562,7 +562,7 @@ acl3svc_setacl (rpcsvc_request_t *req)
}
/* Populate xattr buffer for Default ACL */
- bufheader = (struct posix_acl_xattr_header *)(cs->aclxattr);
+ bufheader = (struct posix_acl_xattr_header *)(cs->daclxattr);
bufheader->version = htole32(POSIX_ACL_VERSION);
bufentry = bufheader->entries;
for (i = 0; i < cs->daclcount; i++) {