[src/netbsd-6]: src/sys/uvm Pull up following revision(s) (requested by riast...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46900786f3ad
branches:  netbsd-6
changeset: 776722:46900786f3ad
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Oct 27 05:42:43 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1133):
        sys/uvm/uvm_swap.c: revision 1.163
Set bp->b_resid to bp->b_bcount on error in swstrategy as required.

diffstat:

 sys/uvm/uvm_swap.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 583ba8d38356 -r 46900786f3ad sys/uvm/uvm_swap.c
--- a/sys/uvm/uvm_swap.c        Mon Oct 27 05:41:21 2014 +0000
+++ b/sys/uvm/uvm_swap.c        Mon Oct 27 05:42:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_swap.c,v 1.161.2.1 2014/03/18 08:09:46 msaitoh Exp $       */
+/*     $NetBSD: uvm_swap.c,v 1.161.2.2 2014/10/27 05:42:43 msaitoh Exp $       */
 
 /*
  * Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.161.2.1 2014/03/18 08:09:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.161.2.2 2014/10/27 05:42:43 msaitoh Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_compat_netbsd.h"
@@ -1134,6 +1134,7 @@
        mutex_exit(&uvm_swap_data_lock);
        if (sdp == NULL) {
                bp->b_error = EINVAL;
+               bp->b_resid = bp->b_bcount;
                biodone(bp);
                UVMHIST_LOG(pdhist, "  failed to get swap device", 0, 0, 0, 0);
                return;