PSARC/2007/218 caller_context_t in all VOPs

PSARC/2007/227 VFS Feature Registration and ACL on Create
PSARC/2007/244 ZFS Case-insensitive support
PSARC/2007/315 Extensible Attribute Interfaces
PSARC/2007/394 ls(1) new command line options '-/' and '-%': CIFS system attributes support
PSARC/2007/403 Modified Access Checks for CIFS
PSARC/2007/410 Add system attribute support to chmod(1)
PSARC/2007/432 CIFS system attributes support for cp(1), pack(1), unpack(1), compress(1) and uncompress(1)
PSARC/2007/444 Rescind SETTABLE Attribute
PSARC/2007/459 CIFS system attributes support for cpio(1), pax(1), tar(1)
PSARC/2007/546 Update utilities to match CIFS system attributes changes.
PSARC/2007/560 ZFS sharesmb property
4890717 want append-only files
6417428 Case-insensitive file system name lookup to support CIFS
6417435 DOS attributes and additional timestamps to support for CIFS
6417442 File system quarantined and modified attributes to support an integrated Anti-Virus service
6417453 FS boolean property for rejecting/allowing invalid UTF-8 sequences in file names
6473733 RFE: Need support for open-deny modes
6473755 RFE:  Need ability to reconcile oplock and delegation conflicts
6494624 sharemgr needs to support CIFS shares better
6546705 All vnode operations need to pass caller_context_t
6546706 Need VOP_SETATTR/VOP_GETATTR to support new, optional attributes
6546893 Solaris system attribute support
6550962 ZFS ACL inheritance needs to be enhanced to support Automatic Inheritance
6553589 RFE: VFS Feature Registration facility
6553770 RFE: ZFS support for ACL-on-CREATE (PSARC 2007/227)
6565581 ls(1) should support file system attributes proposed in PSARC/2007/315
6566784 NTFS streams are not copied along with the files.
6576205 cp(1), pack(1) and compress(1) should support file system attributes proposed in PSARC/2007/315
6578875 RFE: kernel interfaces for nbmand need improvement
6578883 RFE: VOP_SHRLOCK needs additional access types
6578885 chmod(1) should support file system attributes proposed in PSARC/2007/315
6578886 RFE: disallow nbmand state to change on remount
6583349 ACL parser needs to support audit/alarm ACE types
6590347 tar(1) should support filesystem attributes proposed in PSARC/2007/315
6597357 *tar* xv@ doesn't show the hidden directory even though it is restored
6597360 *tar* should re-init xattr info if openat() fails during extraction of and extended attribute
6597368 *tar* cannot restore hard linked extended attributes
6597374 *tar* doesn't display "x " when hard linked attributes are restored
6597375 *tar* extended attribute header off by one
6614861 *cpio* incorrectly archives extended system attributes with -@
6614896 *pax* incorrectly archives extended system attributes with -@
6615225 *tar* incorrectly archives extended system attributes with -@
6617183 CIFS Service - PSARC 2006/715

1 files changed, 24 insertions, 15 deletions

diff --git a/usr/src/uts/common/os/flock.c b/usr/src/uts/common/os/flock.c
index a3028b75dc..da81003d1c 100644
--- a/usr/src/uts/common/os/flock.c
+++ b/usr/src/uts/common/os/flock.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -22,7 +21,7 @@
 /* ONC_PLUS EXTRACT START */
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -201,7 +200,7 @@ static int level_one_path(lock_descriptor_t *, lock_descriptor_t *);
 static int level_two_path(lock_descriptor_t *, lock_descriptor_t *, int);
 #endif
 
-/*	proc_graph function definitons */
+/*	proc_graph function definitions */
 static int flk_check_deadlock(lock_descriptor_t *);
 static void flk_proc_graph_uncolor(void);
 static proc_vertex_t *flk_get_proc_vertex(lock_descriptor_t *);
@@ -684,7 +683,7 @@ flk_zone_fini(zoneid_t zoneid, void *data)
 }
 
 /*
- * Get a lock_descriptor structure with initialisation of edge lists.
+ * Get a lock_descriptor structure with initialization of edge lists.
  */
 
 static lock_descriptor_t *
@@ -727,14 +726,14 @@ flk_set_state(lock_descriptor_t *lock, int new_state)
 {
 	/*
 	 * Locks in the sleeping list may be woken up in a number of ways,
-	 * and more than once.  If a sleeping lock is signalled awake more
+	 * and more than once.  If a sleeping lock is signaled awake more
 	 * than once, then it may or may not change state depending on its
 	 * current state.
 	 * Also note that NLM locks that are sleeping could be moved to an
 	 * interrupted state more than once if the unlock request is
 	 * retransmitted by the NLM client - the second time around, this is
 	 * just a nop.
-	 * The ordering of being signalled awake is:
+	 * The ordering of being signaled awake is:
 	 * INTERRUPTED_STATE > CANCELLED_STATE > GRANTED_STATE.
 	 * The checks below implement this ordering.
 	 */
@@ -2671,7 +2670,7 @@ convoff(vp, lckdat, whence, offset)
 
 	if ((lckdat->l_whence == 2) || (whence == 2)) {
 		vattr.va_mask = AT_SIZE;
-		if (error = VOP_GETATTR(vp, &vattr, 0, CRED()))
+		if (error = VOP_GETATTR(vp, &vattr, 0, CRED(), NULL))
 			return (error);
 	}
 
@@ -3271,7 +3270,7 @@ flk_set_lockmgr_status(flk_lockmgr_status_t status)
  *
  * A list containing the vnode pointer and an flock structure
  * describing the lock is returned.  Each element in the list is
- * dynammically allocated and must be freed by the caller.  The
+ * dynamically allocated and must be freed by the caller.  The
  * last item in the list is denoted by a NULL value in the ll_next
  * field.
  *
@@ -3721,7 +3720,7 @@ wait_for_lock(lock_descriptor_t *request)
  * Create an flock structure from the existing lock information
  *
  * This routine is used to create flock structures for the lock manager
- * to use in a reclaim request.  Since the lock was orginated on this
+ * to use in a reclaim request.  Since the lock was originated on this
  * host, it must be conforming to UNIX semantics, so no checking is
  * done to make sure it falls within the lower half of the 32-bit range.
  */
@@ -3768,7 +3767,7 @@ flk_convert_lock_data(vnode_t *vp, flock64_t *flp,
 		break;
 	case 2:		/* SEEK_END */
 		vattr.va_mask = AT_SIZE;
-		if (error = VOP_GETATTR(vp, &vattr, 0, CRED()))
+		if (error = VOP_GETATTR(vp, &vattr, 0, CRED(), NULL))
 			return (error);
 		*start = (u_offset_t)(flp->l_start + vattr.va_size);
 		break;
@@ -3914,11 +3913,21 @@ cl_flk_change_nlm_state_to_unknown(int nlmid)
 
 int
 nbl_lock_conflict(vnode_t *vp, nbl_op_t op, u_offset_t offset,
-		ssize_t length, int svmand)
+		ssize_t length, int svmand, caller_context_t *ct)
 {
 	int conflict = 0;
 	graph_t			*gp;
 	lock_descriptor_t	*lock;
+	pid_t pid;
+	int sysid;
+
+	if (ct == NULL) {
+		pid = curproc->p_pid;
+		sysid = 0;
+	} else {
+		pid = ct->cc_pid;
+		sysid = ct->cc_sysid;
+	}
 
 	mutex_enter(&flock_lock);
 	gp = lock_graph[HASH_INDEX(vp)];
@@ -3931,8 +3940,8 @@ nbl_lock_conflict(vnode_t *vp, nbl_op_t op, u_offset_t offset,
 
 	for (; lock && lock->l_vnode == vp; lock = lock->l_next) {
 		if ((svmand || (lock->l_state & NBMAND_LOCK)) &&
-		    lock->l_flock.l_sysid == 0 &&
-		    lock->l_flock.l_pid != curproc->p_pid &&
+		    (lock->l_flock.l_sysid != sysid ||
+		    lock->l_flock.l_pid != pid) &&
 		    lock_blocks_io(op, offset, length,
 				lock->l_type, lock->l_start, lock->l_end)) {
 			conflict = 1;