PERFORCE change 1189042 for review

[John Baldwin]

http://p4web.freebsd.org/@@1189042?ac=10

Change 1189042 by jhb at jhb_jhbbsd on 2013/12/10 21:30:16

	IFC @1189040

Affected files ...

.. //depot/projects/smpng/sys/kern/vfs_bio.c#154 integrate

Differences ...

==== //depot/projects/smpng/sys/kern/vfs_bio.c#154 (text+ko) ====

@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/kern/vfs_bio.c 258174 2013-11-15 15:29:53Z jhb $");
+__FBSDID("$FreeBSD: head/sys/kern/vfs_bio.c 259200 2013-12-10 21:15:18Z kib $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -3679,7 +3679,6 @@
 
 	bp = bip->bio_caller2;
 	bp->b_resid = bp->b_bcount - bip->bio_completed;
-	bp->b_resid = bip->bio_resid;	/* XXX: remove */
 	bp->b_ioflags = bip->bio_flags;
 	bp->b_error = bip->bio_error;
 	if (bp->b_error)