Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl

This commit is contained in:
Brian Behlendorf 2008-12-18 09:06:20 -08:00
parent a2cbba5d19 6b7c775e09
commit a8a380dfa5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/zfs/dmu_objset.c
View File

@ -843,6 +843,8 @@ dmu_objset_sync_dnodes(list_t *list, dmu_tx_t *tx)
static void static void
ready(zio_t *zio, arc_buf_t *abuf, void *arg) ready(zio_t *zio, arc_buf_t *abuf, void *arg)
{ {
int i;
blkptr_t *bp = zio->io_bp; blkptr_t *bp = zio->io_bp;
blkptr_t *bp_orig = &zio->io_bp_orig; blkptr_t *bp_orig = &zio->io_bp_orig;
objset_impl_t *os = arg; objset_impl_t *os = arg;
@ -856,7 +858,7 @@ ready(zio_t *zio, arc_buf_t *abuf, void *arg)
* Update rootbp fill count. * Update rootbp fill count.
*/ */
bp->blk_fill = 1; /* count the meta-dnode */ bp->blk_fill = 1; /* count the meta-dnode */
for (int i = 0; i < dnp->dn_nblkptr; i++) for (i = 0; i < dnp->dn_nblkptr; i++)
bp->blk_fill += dnp->dn_blkptr[i].blk_fill; bp->blk_fill += dnp->dn_blkptr[i].blk_fill;
if (zio->io_flags & ZIO_FLAG_IO_REWRITE) { if (zio->io_flags & ZIO_FLAG_IO_REWRITE) {
@ -960,11 +962,11 @@ dmu_objset_fsid_guid(objset_t *os)
} }
void void
dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *stat) dmu_objset_fast_stat(objset_t *os, dmu_objset_stats_t *st)
{ {
stat->dds_type = os->os->os_phys->os_type; st->dds_type = os->os->os_phys->os_type;
if (os->os->os_dsl_dataset) if (os->os->os_dsl_dataset)
dsl_dataset_fast_stat(os->os->os_dsl_dataset, stat); dsl_dataset_fast_stat(os->os->os_dsl_dataset, st);
} }
void void