6746299 assertion !vn_ismntpt(vp) fail in snv_98

6833224 TX NFS client file access returns EACCES randomly for non-ADMIN_LOW labeled resources

1 files changed, 0 insertions, 27 deletions

diff --git a/usr/src/uts/common/fs/nfs/nfs_subr.c b/usr/src/uts/common/fs/nfs/nfs_subr.c
index 6477e27f25..f38854ab54 100644
--- a/usr/src/uts/common/fs/nfs/nfs_subr.c
+++ b/usr/src/uts/common/fs/nfs/nfs_subr.c
@@ -5125,33 +5125,6 @@ nfs_has_ctty(void)
 }
 
 /*
- * TX NFS routine used by NFSv3 and NFSv4 to do label check
- * on client label and server's file object lable.
- */
-boolean_t
-do_rfs_label_check(bslabel_t *clabel, vnode_t *vp, int flag)
-{
-	bslabel_t *slabel;
-	ts_label_t *tslabel;
-	boolean_t result;
-
-	if ((tslabel = nfs_getflabel(vp)) == NULL) {
-		return (B_FALSE);
-	}
-	slabel = label2bslabel(tslabel);
-	DTRACE_PROBE4(tx__rfs__log__info__labelcheck, char *,
-	    "comparing server's file label(1) with client label(2) (vp(3))",
-	    bslabel_t *, slabel, bslabel_t *, clabel, vnode_t *, vp);
-
-	if (flag == EQUALITY_CHECK)
-		result = blequal(clabel, slabel);
-	else
-		result = bldominates(clabel, slabel);
-	label_rele(tslabel);
-	return (result);
-}
-
-/*
  * See if xattr directory to see if it has any generic user attributes
  */
 int