PERFORCE change 153169 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=153169

Change 153169 by trasz at trasz_strashydlo on 2008/11/18 21:34:46

	Uncomment stuff that shouldn't be commented in the first place.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 (text+ko) ====

@@ -347,12 +347,8 @@
 			    lr->lr_uid, lr->lr_gid);
 		}
 
-#ifdef TODO
 		error = VOP_CREATE(ZTOV(dzp), name, &xva.xva_vattr,
 		    0, 0, &vp, kcred, vflg, NULL, &vsec);
-#else
-		panic("%s:%u: unsupported condition", __func__, __LINE__);
-#endif
 		break;
 	case TX_MKDIR_ACL:
 		aclstart = (caddr_t)(lracl + 1);
@@ -381,12 +377,8 @@
 			    (void *)&name, lracl->lr_fuidcnt, lracl->lr_domcnt,
 			    lr->lr_uid, lr->lr_gid);
 		}
-#ifdef TODO
 		error = VOP_MKDIR(ZTOV(dzp), name, &xva.xva_vattr,
 		    &vp, kcred, NULL, vflg, &vsec);
-#else
-		panic("%s:%u: unsupported condition", __func__, __LINE__);
-#endif
 		break;
 	default:
 		error = ENOTSUP;
@@ -832,9 +824,6 @@
 	vsa.vsa_aclentp = ace;
 
 	error = VOP_SETSECATTR(ZTOV(zp), &vsa, 0, kcred, NULL);
-#else
-	panic("%s:%u: unsupported condition", __func__, __LINE__);
-#endif
 
 	VN_RELE(ZTOV(zp));
 
@@ -884,7 +873,6 @@
 		return (error);
 	}
 
-#ifdef TODO
 	bzero(&vsa, sizeof (vsa));
 	vsa.vsa_mask = VSA_ACE | VSA_ACECNT | VSA_ACE_ACLFLAGS;
 	vsa.vsa_aclcnt = lr->lr_aclcnt;
@@ -905,9 +893,6 @@
 
 	if (zfsvfs->z_fuid_replay)
 		zfs_fuid_info_free(zfsvfs->z_fuid_replay);
-#else
-	error = EOPNOTSUPP;
-#endif
 
 	zfsvfs->z_fuid_replay = NULL;
 	VN_RELE(ZTOV(zp));