Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fix blkno->offset calculation for simulated non-512 devices

Browse Source 
* allows transfers only in multiples of block size
* g/c unused struct member
This commit is contained in:
pooka 2011-02-03 10:06:06 +00:00
parent 342e3df70b
commit 2f1c12f11d
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/rump/librump/rumpvfs/rumpblk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rumpblk.c,v 1.43 2011/02/02 15:55:22 pooka Exp $ */ /* $NetBSD: rumpblk.c,v 1.44 2011/02/03 10:06:06 pooka Exp $ */
/* /*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved. * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@ -52,7 +52,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.43 2011/02/02 15:55:22 pooka Exp $"); __KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.44 2011/02/03 10:06:06 pooka Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/buf.h> #include <sys/buf.h>
@ -99,7 +99,6 @@ struct blkwin {
static struct rblkdev { static struct rblkdev {
char *rblk_path; char *rblk_path;
int rblk_fd; int rblk_fd;
int rblk_opencnt;
#ifdef HAS_ODIRECT #ifdef HAS_ODIRECT
int rblk_dfd; int rblk_dfd;
#endif #endif
@ -467,7 +466,6 @@ rumpblk_deregister(const char *path)
rblk = &minors[i]; rblk = &minors[i];
KASSERT(rblk->rblk_fd == -1); KASSERT(rblk->rblk_fd == -1);
KASSERT(rblk->rblk_opencnt == 0);
wincleanup(rblk); wincleanup(rblk);
free(rblk->rblk_path, M_TEMP); free(rblk->rblk_path, M_TEMP);
@ -632,6 +630,11 @@ dostrategy(struct buf *bp)
int async = bp->b_flags & B_ASYNC; int async = bp->b_flags & B_ASYNC;
int error; int error;
if (bp->b_bcount % (1<<sectshift) != 0) {
rump_biodone(bp, 0, EINVAL);
return;
}
/* collect statistics */ /* collect statistics */
ev_io_total.ev_count++; ev_io_total.ev_count++;
if (async) if (async)
@ -644,7 +647,13 @@ dostrategy(struct buf *bp)
ev_bread_total.ev_count++; ev_bread_total.ev_count++;
} }
off = bp->b_blkno << sectshift; /*
* b_blkno is always in terms of DEV_BSIZE, and since we need
* to translate to a byte offset for the host read, this
* calculation does not need sectshift.
*/
off = bp->b_blkno << DEV_BSHIFT;
/* /*
* Do bounds checking if we're working on a file. Otherwise * Do bounds checking if we're working on a file. Otherwise
* invalid file systems might attempt to read beyond EOF. This * invalid file systems might attempt to read beyond EOF. This