PERFORCE change 31201 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=31201

Change 31201 by peter at peter_hammer on 2003/05/14 15:15:03

	IFC @31195

Affected files ...

.. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#8 integrate
.. //depot/projects/hammer/sys/pc98/i386/machdep.c#14 integrate
.. //depot/projects/hammer/usr.sbin/extattrctl/extattrctl.8#2 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate

Differences ...

==== //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#8 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.34 2003/05/12 18:15:33 mux Exp $
+ * $FreeBSD: src/sys/dev/fxp/if_fxpreg.h,v 1.35 2003/05/14 20:33:41 mux Exp $
  */
 
 #define FXP_VENDORID_INTEL	0x8086
@@ -291,18 +291,18 @@
 	 * fetched along with the TxCB.
 	 */
 	union {
-		struct fxp_ipcb xx;
+		struct fxp_ipcb ipcb;
 		struct fxp_tbd tbd[FXP_NTXSEG];
 	} tx_cb_u;
 };
 
 #define tbd			tx_cb_u.tbd
-#define ipcb_schedule_low	tx_cb_u.xx.ipcb_schedule_low
-#define ipcb_ip_schedule	tx_cb_u.xx.ipcb_ip_schedule
-#define ipcb_ip_activation_high tx_cb_u.xx.ipcb_ip_activation_high
-#define ipcb_vlan_id		tx_cb_u.xx.ipcb_vlan_id
-#define ipcb_ip_header_offset	tx_cb_u.xx.ipcb_ip_header_offset
-#define ipcb_tcp_header_offset	tx_cb_u.xx.ipcb_tcp_header_offset
+#define ipcb_schedule_low	tx_cb_u.ipcb.ipcb_schedule_low
+#define ipcb_ip_schedule	tx_cb_u.ipcb.ipcb_ip_schedule
+#define ipcb_ip_activation_high tx_cb_u.ipcb.ipcb_ip_activation_high
+#define ipcb_vlan_id		tx_cb_u.ipcb.ipcb_vlan_id
+#define ipcb_ip_header_offset	tx_cb_u.ipcb.ipcb_ip_header_offset
+#define ipcb_tcp_header_offset	tx_cb_u.ipcb.ipcb_tcp_header_offset
 
 /*
  * IPCB field definitions

==== //depot/projects/hammer/sys/pc98/i386/machdep.c#14 (text+ko) ====

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.317 2003/05/13 20:36:01 jhb Exp $
+ * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.318 2003/05/14 20:21:42 jhb Exp $
  */
 
 #include "opt_atalk.h"
@@ -567,7 +567,7 @@
 	p = td->td_proc;
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	psp = p->p_sigacts;
-	mtx_assert(&psp->ps_mtx,.MA_OWNED);
+	mtx_assert(&psp->ps_mtx, MA_OWNED);
 #ifdef COMPAT_FREEBSD4
 	if (SIGISMEMBER(psp->ps_freebsd4, sig)) {
 		freebsd4_sendsig(catcher, sig, mask, code);

==== //depot/projects/hammer/usr.sbin/extattrctl/extattrctl.8#2 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"       $FreeBSD: src/usr.sbin/extattrctl/extattrctl.8,v 1.22 2002/07/14 14:43:04 charnier Exp $
+.\"       $FreeBSD: src/usr.sbin/extattrctl/extattrctl.8,v 1.23 2003/05/14 20:31:06 rwatson Exp $
 .\"
 .\" Developed by the TrustedBSD Project.
 .\" Support for file system extended attribute.
@@ -148,16 +148,16 @@
 .Pp
 Start extended attributes on the root file system.
 .Pp
-.Dl extattrctl initattr 17 /.attribute/md5
+.Dl extattrctl initattr 17 /.attribute/system/md5
 .Pp
-Create an attribute backing file in /.attribute/md5, and set the maximum
+Create an attribute backing file in /.attribute/system/md5, and set the maximum
 size of each attribute to 17 bytes, with a sparse file used for storing
 the attributes.
 .Pp
-.Dl extattrctl enable / system md5 /.attribute/md5
+.Dl extattrctl enable / system md5 /.attribute/system/md5
 .Pp
 Enable an attribute named md5 on the root file system, backed from the file
-/.attribute/md5.
+/.attribute/system/md5.
 .Pp
 .Dl extattrctl disable / md5
 .Pp

==== //depot/projects/hammer/usr.sbin/rpc.lockd/lockd_lock.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: lockd_lock.c,v 1.5 2000/11/21 03:47:41 enami Exp $	*/
-/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.10 2002/03/22 19:57:09 alfred Exp $ */
+/*	$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.11 2003/05/14 21:16:33 rwatson Exp $ */
 
 /*
  * Copyright (c) 2001 Andrew P. Lentvorski, Jr.
@@ -1401,12 +1401,17 @@
 	if (retval == PFL_NFSDENIED || retval == PFL_HWDENIED) {
 		/* Once last chance to check the lock */
 		if (fl->blocking == 1) {
-			/* Queue the lock */
-			debuglog("BLOCKING LOCK RECEIVED\n");
-			retval = (retval == PFL_NFSDENIED ?
-			    PFL_NFSBLOCKED : PFL_HWBLOCKED);
-			add_blockingfilelock(fl);
-			dump_filelock(fl);
+			if (retval == PFL_NFSDENIED) {
+				/* Queue the lock */
+				debuglog("BLOCKING LOCK RECEIVED\n");
+				retval = PFL_NFSBLOCKED;
+				add_blockingfilelock(fl);
+				dump_filelock(fl);
+			} else {
+				/* retval is okay as PFL_HWDENIED */
+				debuglog("BLOCKING LOCK DENIED IN HARDWARE\n");
+				dump_filelock(fl);
+			}
 		} else {
 			/* Leave retval alone, it's already correct */
 			debuglog("Lock denied.  Non-blocking failure\n");