svn commit: r340637 - head/sys/vm

[Alan Cox]

Author: alc
Date: Mon Nov 19 17:17:23 2018
New Revision: 340637
URL: https://svnweb.freebsd.org/changeset/base/340637

Log:
  Use swp_pager_isondev() throughout.  Submitted by: ota at j.email.ne.jp
  
  Change swp_pager_isondev()'s return type to bool.
  
  Reviewed by:	kib
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D16712

Modified:
  head/sys/vm/swap_pager.c

Modified: head/sys/vm/swap_pager.c
==============================================================================
--- head/sys/vm/swap_pager.c	Mon Nov 19 17:09:57 2018	(r340636)
+++ head/sys/vm/swap_pager.c	Mon Nov 19 17:17:23 2018	(r340637)
@@ -756,7 +756,7 @@ done:
 	return (blk);
 }
 
-static int
+static bool
 swp_pager_isondev(daddr_t blk, struct swdevt *sp)
 {
 
@@ -770,7 +770,7 @@ swp_pager_strategy(struct buf *bp)
 
 	mtx_lock(&sw_dev_mtx);
 	TAILQ_FOREACH(sp, &swtailq, sw_list) {
-		if (bp->b_blkno >= sp->sw_first && bp->b_blkno < sp->sw_end) {
+		if (swp_pager_isondev(bp->b_blkno, sp)) {
 			mtx_unlock(&sw_dev_mtx);
 			if ((sp->sw_flags & SW_UNMAPPED) != 0 &&
 			    unmapped_buf_allowed) {
@@ -804,7 +804,7 @@ swp_pager_freeswapspace(daddr_t blk, daddr_t npages)
 		return;
 	mtx_lock(&sw_dev_mtx);
 	TAILQ_FOREACH(sp, &swtailq, sw_list) {
-		if (blk >= sp->sw_first && blk < sp->sw_end) {
+		if (swp_pager_isondev(blk, sp)) {
 			sp->sw_used -= npages;
 			/*
 			 * If we are attempting to stop swapping on