From fa9e4066f08beec538e775443c5be79dd423fcab Mon Sep 17 00:00:00 2001 From: ahrens Date: Mon, 31 Oct 2005 11:33:35 -0800 Subject: PSARC 2002/240 ZFS 6338653 Integrate ZFS PSARC 2004/652 - DKIOCFLUSH 5096886 Write caching disks need mechanism to flush cache to physical media --- usr/src/cmd/ttymon/tmexpress.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'usr/src/cmd/ttymon/tmexpress.c') diff --git a/usr/src/cmd/ttymon/tmexpress.c b/usr/src/cmd/ttymon/tmexpress.c index caef33b343..f9bc5363e2 100644 --- a/usr/src/cmd/ttymon/tmexpress.c +++ b/usr/src/cmd/ttymon/tmexpress.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -431,23 +431,6 @@ revokedevaccess(char *dev, uid_t uid, gid_t gid, mode_t mode) } while (fdetach(dev) == 0); /* Remove ACLs */ - if (acl(dev, GETACLCNT, 0, NULL) > MIN_ACL_ENTRIES) { - aclent_t acls[3]; - acls[0].a_type = USER_OBJ; - acls[0].a_id = uid; - acls[0].a_perm = 0; - - acls[1].a_type = GROUP_OBJ; - acls[1].a_id = gid; - acls[1].a_perm = 0; - - acls[2].a_type = OTHER_OBJ; - acls[2].a_id = 0; - acls[2].a_perm = 0; - - (void) acl(dev, SETACL, 3, acls); - } - - (void) chmod(dev, mode); + (void) acl_strip(dev, uid, gid, mode); } -- cgit v1.2.3