diff options
| author | sotech117 <26747948+sotech117@users.noreply.github.com> | 2024-04-25 03:45:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 03:45:32 -0400 |
| commit | c9f4da6024393310e254a2cba679b1f1cc67607a (patch) | |
| tree | 6f7a61225676b9578c0e0c46cdd54a10bad9c9e3 /kernel/drivers | |
| parent | a17999858ddaada83071d953d920e3c2a2b390c8 (diff) | |
| parent | fb4b8fbec69f50c7386017896f0add4d46314a1d (diff) | |
Merge branch 'brown-cs1690:master' into master
Diffstat (limited to 'kernel/drivers')
| -rw-r--r-- | kernel/drivers/blockdev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/drivers/blockdev.c b/kernel/drivers/blockdev.c index 5c8eb82..79f25c2 100644 --- a/kernel/drivers/blockdev.c +++ b/kernel/drivers/blockdev.c @@ -79,7 +79,6 @@ long blockdev_fill_pframe(mobj_t *mobj, pframe_t *pf) KASSERT(mobj && pf); KASSERT(pf->pf_pagenum <= (1UL << (8 * sizeof(blocknum_t)))); blockdev_t *bd = CONTAINER_OF(mobj, s5fs_t, s5f_mobj)->s5f_bdev; - KASSERT(pf->pf_loc); return bd->bd_ops->read_block(bd, pf->pf_addr, (blocknum_t)pf->pf_loc, 1); } @@ -90,7 +89,6 @@ long blockdev_flush_pframe(mobj_t *mobj, pframe_t *pf) KASSERT(pf->pf_pagenum <= (1UL << (8 * sizeof(blocknum_t)))); dbg(DBG_S5FS, "writing disk block %lu\n", pf->pf_pagenum); blockdev_t *bd = CONTAINER_OF(mobj, s5fs_t, s5f_mobj)->s5f_bdev; - KASSERT(pf->pf_loc); return bd->bd_ops->write_block(bd, pf->pf_addr, (blocknum_t)pf->pf_loc, 1); }
\ No newline at end of file |