*** NO COMMENTS ***

@@ -457,20 +457,12 @@
         if (vp == NULL) {
                 error = ESTALE;
                 goto out;
         }
 
-#ifdef DEBUG
-        if (rfs3_do_post_op_attr) {
                 va.va_mask = AT_ALL;
                 vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-        } else
-                vap = NULL;
-#else
-        va.va_mask = AT_ALL;
-        vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-#endif
 
         bzero((caddr_t)&resp->resok.acl, sizeof (resp->resok.acl));
 
         resp->resok.acl.vsa_mask = args->mask;
 

@@ -496,20 +488,12 @@
         }
 
         if (error)
                 goto out;
 
-#ifdef DEBUG
-        if (rfs3_do_post_op_attr) {
-                va.va_mask = AT_ALL;
-                vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-        } else
-                vap = NULL;
-#else
         va.va_mask = AT_ALL;
         vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-#endif
 
         VN_RELE(vp);
 
         resp->status = NFS3_OK;
         vattr_to_post_op_attr(vap, &resp->resok.attr);

@@ -586,38 +570,22 @@
                 goto out1;
         }
 
         (void) VOP_RWLOCK(vp, V_WRITELOCK_TRUE, NULL);
 
-#ifdef DEBUG
-        if (rfs3_do_post_op_attr) {
                 va.va_mask = AT_ALL;
                 vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-        } else
-                vap = NULL;
-#else
-        va.va_mask = AT_ALL;
-        vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-#endif
 
         if (rdonly(exi, req) || vn_is_readonly(vp)) {
                 resp->status = NFS3ERR_ROFS;
                 goto out1;
         }
 
         error = VOP_SETSECATTR(vp, &args->acl, 0, cr, NULL);
 
-#ifdef DEBUG
-        if (rfs3_do_post_op_attr) {
-                va.va_mask = AT_ALL;
-                vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-        } else
-                vap = NULL;
-#else
         va.va_mask = AT_ALL;
         vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va;
-#endif
 
         if (error)
                 goto out;
 
         VOP_RWUNLOCK(vp, V_WRITELOCK_TRUE, NULL);