diff options
| author | avg <avg@FreeBSD.org> | 2010-04-02 15:12:31 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2010-04-02 15:12:31 +0000 |
| commit | ad244906c74c0dab6b5a3c0aed3426a7b51f2f3c (patch) | |
| tree | 5a2b2410777b589cd53eed7c16c4cae71b743245 /sys/kern | |
| parent | c65335fc919d64806cca03d40485891ca2bbc851 (diff) | |
| download | FreeBSD-src-ad244906c74c0dab6b5a3c0aed3426a7b51f2f3c.zip FreeBSD-src-ad244906c74c0dab6b5a3c0aed3426a7b51f2f3c.tar.gz | |
bo_bsize: revert r205860 and take an alternative approch in getblk
In r205860 I missed the fact that there is code that strongly assumes
that devvp bo_bsize is equal to underlying provider's sectorsize.
In those places it is hard to obtain the sectorsize in an alternative
way if devvp bo_bsize is set to something else.
So, I am reverting bo_bsize assigment in g_vfs_open.
Instead, in getblk I use DEV_BSIZE block size for b_offset calculation
if vp is a disk vp as reported by vn_isdisk. This should coinside with
vp being a devvp.
Reported by: Mykola Dzham <i@levsha.me>
Tested by: Mykola Dzham <i@levsha.me>
Pointyhat to: avg
MFC after: 2 weeks
X-ToDo: convert bread(devvp) in all fs to use bo_bsize-d blocks
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_bio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index df9a257..4e9cfc6 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -2678,7 +2678,7 @@ loop: */ if (flags & GB_NOCREAT) return NULL; - bsize = bo->bo_bsize; + bsize = vn_isdisk(vp, NULL) ? DEV_BSIZE : bo->bo_bsize; offset = blkno * bsize; vmio = vp->v_object != NULL; maxsize = vmio ? size + (offset & PAGE_MASK) : size; |
