Print this page
onc plus-be-gone
*** 16,26 ****
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
- /* ONC_PLUS EXTRACT START */
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
--- 16,25 ----
*** 607,617 ****
newcb->cb_prev = cblist->cb_prev;
newcb->cb_next = cblist;
cblist->cb_prev->cb_next = newcb;
cblist->cb_prev = newcb;
}
- /* ONC_PLUS EXTRACT END */
/*
* Initialize the flk_edge_cache data structure and create the
* nlm_reg_status array.
*/
--- 606,615 ----
*** 982,992 ****
*/
return (flk_wait_execute_request(request));
}
}
- /* ONC_PLUS EXTRACT START */
/*
* The actual execution of the request in the simple case is only to
* insert the 'request' in the list of active locks if it is not an
* UNLOCK.
* We have to consider the existing active locks' relation to
--- 980,989 ----
*** 1041,1051 ****
if (request->l_type != F_UNLCK)
flk_insert_active_lock(request);
return (0);
}
- /* ONC_PLUS EXTRACT END */
/*
* 'request' is blocked by some one therefore we put it into sleep queue.
*/
static int
--- 1038,1047 ----
*** 2241,2251 ****
done:
mutex_exit(&gp->gp_mutex);
return (result);
}
- /* ONC_PLUS EXTRACT START */
/*
* Determine whether there are any locks for the given vnode with a remote
* sysid. Returns zero if not, non-zero if there are.
*
* Note that the return value from this function is potentially invalid
--- 2237,2246 ----
*** 2612,2622 ****
CHECK_SLEEPING_LOCKS(gp);
CHECK_ACTIVE_LOCKS(gp);
CHECK_OWNER_LOCKS(gp, pid, sysid, vp);
mutex_exit(&gp->gp_mutex);
}
- /* ONC_PLUS EXTRACT END */
/*
* Called from 'fs' read and write routines for files that have mandatory
* locking enabled.
--- 2607,2616 ----
*** 2651,2661 ****
bf.l_type != F_UNLCK)
error = i ? i : EAGAIN;
return (error);
}
- /* ONC_PLUS EXTRACT START */
/*
* convoff - converts the given data (start, whence) to the
* given whence.
*/
int
--- 2645,2654 ----
*** 2704,2714 ****
}
lckdat->l_whence = (short)whence;
return (0);
}
- /* ONC_PLUS EXTRACT END */
/* proc_graph function definitions */
/*
--- 2697,2706 ----
*** 3068,3078 ****
fromproc->edge = pep;
}
mutex_exit(&flock_lock);
}
- /* ONC_PLUS EXTRACT START */
/*
* Set the control status for lock manager requests.
*
*/
--- 3060,3069 ----
*** 3690,3700 ****
}
}
mutex_exit(&gp->gp_mutex);
}
}
- /* ONC_PLUS EXTRACT END */
/*
* Wait until a lock is granted, cancelled, or interrupted.
*/
--- 3681,3690 ----
*** 3713,3723 ****
request->l_state |= INTERRUPTED_LOCK;
}
}
}
- /* ONC_PLUS EXTRACT START */
/*
* 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 originated on this
--- 3703,3712 ----
*** 3868,3878 ****
flrp->l_len = blocker->l_end -
blocker->l_start + 1;
}
}
}
- /* ONC_PLUS EXTRACT END */
/*
* PSARC case 1997/292
*/
/*
--- 3857,3866 ----