Author: markj
Date: Tue Mar 3 15:07:48 2020
New Revision: 358581
URL: https://svnweb.freebsd.org/changeset/base/358581
Log:
MFC r358026:
Remove swblk_t.
Modified:
stable/12/lib/libkvm/kvm_getswapinfo.c
stable/12/sys/vm/swap_pager.c
stable/12/sys/vm/swap_pager.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/lib/libkvm/kvm_getswapinfo.c
==============================================================================
--- stable/12/lib/libkvm/kvm_getswapinfo.c Tue Mar 3 15:05:13 2020
(r358580)
+++ stable/12/lib/libkvm/kvm_getswapinfo.c Tue Mar 3 15:07:48 2020
(r358581)
@@ -115,8 +115,7 @@ int
kvm_getswapinfo_kvm(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int i;
- swblk_t ttl;
+ int i, ttl;
TAILQ_HEAD(, swdevt) swtailq;
struct swdevt *sp, swinfo;
struct kvm_swap tot;
@@ -167,8 +166,7 @@ int
kvm_getswapinfo_sysctl(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int ti;
- swblk_t ttl;
+ int ti, ttl;
size_t mibi, len;
int soid[SWI_MAXMIB];
struct xswdev xsd;
Modified: stable/12/sys/vm/swap_pager.c
==============================================================================
--- stable/12/sys/vm/swap_pager.c Tue Mar 3 15:05:13 2020
(r358580)
+++ stable/12/sys/vm/swap_pager.c Tue Mar 3 15:07:48 2020
(r358581)
@@ -2284,7 +2284,7 @@ swaponsomething(struct vnode *vp, void *id, u_long nbl
sw_strategy_t *strategy, sw_close_t *close, dev_t dev, int flags)
{
struct swdevt *sp, *tsp;
- swblk_t dvbase;
+ daddr_t dvbase;
u_long mblocks;
/*
Modified: stable/12/sys/vm/swap_pager.h
==============================================================================
--- stable/12/sys/vm/swap_pager.h Tue Mar 3 15:05:13 2020
(r358580)
+++ stable/12/sys/vm/swap_pager.h Tue Mar 3 15:07:48 2020
(r358581)
@@ -38,14 +38,9 @@
*/
#ifndef _VM_SWAP_PAGER_H_
-#define _VM_SWAP_PAGER_H_ 1
+#define _VM_SWAP_PAGER_H_
-typedef int32_t swblk_t; /*
- * swap offset. This is the type used to
- * address the "virtual swap device" and
- * therefore the maximum swap space is
- * 2^32 pages.
- */
+#include <sys/_types.h>
struct buf;
struct swdevt;
@@ -62,8 +57,8 @@ struct swdevt {
dev_t sw_dev;
struct vnode *sw_vp;
void *sw_id;
- swblk_t sw_first;
- swblk_t sw_end;
+ __daddr_t sw_first;
+ __daddr_t sw_end;
struct blist *sw_blist;
TAILQ_ENTRY(swdevt) sw_list;
sw_strategy_t *sw_strategy;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
