onc plus-be-gone

@@ -16,11 +16,10 @@
  * 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.
  */

@@ -607,11 +606,10 @@
         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.
  */

@@ -982,11 +980,10 @@
                  */
                 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

@@ -1041,11 +1038,10 @@
         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

@@ -2241,11 +2237,10 @@
 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

@@ -2612,11 +2607,10 @@
         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.

@@ -2651,11 +2645,10 @@
             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

@@ -2704,11 +2697,10 @@
         }
 
         lckdat->l_whence = (short)whence;
         return (0);
 }
-/* ONC_PLUS EXTRACT END */
 
 
 /*      proc_graph function definitions */
 
 /*

@@ -3068,11 +3060,10 @@
                 fromproc->edge = pep;
         }
         mutex_exit(&flock_lock);
 }
 
-/* ONC_PLUS EXTRACT START */
 /*
  * Set the control status for lock manager requests.
  *
  */
 

@@ -3690,11 +3681,10 @@
                         }
                 }
                 mutex_exit(&gp->gp_mutex);
         }
 }
-/* ONC_PLUS EXTRACT END */
 
 
 /*
  * Wait until a lock is granted, cancelled, or interrupted.
  */

@@ -3713,11 +3703,10 @@
                         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

@@ -3868,11 +3857,10 @@
                                 flrp->l_len = blocker->l_end -
                                         blocker->l_start + 1;
                 }
         }
 }
-/* ONC_PLUS EXTRACT END */
 
 /*
  * PSARC case 1997/292
  */
 /*