From owner-p4-projects@FreeBSD.ORG  Tue Dec 10 21:30:53 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 5EE41B77; Tue, 10 Dec 2013 21:30:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 21942B75
 for <perforce@freebsd.org>; Tue, 10 Dec 2013 21:30:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0CAAB123F
 for <perforce@freebsd.org>; Tue, 10 Dec 2013 21:30:53 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rBALUqvG018779
 for <perforce@freebsd.org>; Tue, 10 Dec 2013 21:30:52 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.7/Submit) id rBALUqqW018776
 for perforce@freebsd.org; Tue, 10 Dec 2013 21:30:52 GMT
 (envelope-from jhb@freebsd.org)
Date: Tue, 10 Dec 2013 21:30:52 GMT
Message-Id: <201312102130.rBALUqqW018776@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1189042 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 21:30:53 -0000

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

Change 1189042 by jhb@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)