From 760be5c8cae4dbbdebbf5710ff2278fcecdd114b Mon Sep 17 00:00:00 2001 From: phk Date: Thu, 5 Jun 2003 21:57:19 +0000 Subject: Fix NFS file swapping, I broke it 3 months ago it seems. --- sys/vm/vm_swap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 057a85d..4d9e783 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -314,12 +314,12 @@ swaponvp(td, vp, dev, nblks) if (error) return (error); - error = VOP_IOCTL(vp, DIOCGMEDIASIZE, (caddr_t)&mediasize, - FREAD, td->td_ucred, td); - if (error == 0) - nblks = mediasize / DEV_BSIZE; - else - nblks = 0; + if (nblks == 0) { + error = VOP_IOCTL(vp, DIOCGMEDIASIZE, (caddr_t)&mediasize, + FREAD, td->td_ucred, td); + if (error == 0) + nblks = mediasize / DEV_BSIZE; + } /* * XXX: We should also check that the sectorsize makes sense * XXX: it should be a power of two, no larger than the page size. -- cgit v1.1