Deleted Added
full compact
dbuf.c (249195) dbuf.c (251478)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 8 unchanged lines hidden (view full) ---

17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21/*
22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
24 * Copyright (c) 2013 by Delphix. All rights reserved.
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 8 unchanged lines hidden (view full) ---

17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21/*
22 * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
23 * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
24 * Copyright (c) 2013 by Delphix. All rights reserved.
25 * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
25 */
26
27#include <sys/zfs_context.h>
28#include <sys/dmu.h>
29#include <sys/dmu_impl.h>
30#include <sys/dbuf.h>
31#include <sys/dmu_objset.h>
32#include <sys/dsl_dataset.h>

--- 530 unchanged lines hidden (view full) ---

563 spa = dn->dn_objset->os_spa;
564 DB_DNODE_EXIT(db);
565
566 db->db_state = DB_READ;
567 mutex_exit(&db->db_mtx);
568
569 if (DBUF_IS_L2CACHEABLE(db))
570 aflags |= ARC_L2CACHE;
26 */
27
28#include <sys/zfs_context.h>
29#include <sys/dmu.h>
30#include <sys/dmu_impl.h>
31#include <sys/dbuf.h>
32#include <sys/dmu_objset.h>
33#include <sys/dsl_dataset.h>

--- 530 unchanged lines hidden (view full) ---

564 spa = dn->dn_objset->os_spa;
565 DB_DNODE_EXIT(db);
566
567 db->db_state = DB_READ;
568 mutex_exit(&db->db_mtx);
569
570 if (DBUF_IS_L2CACHEABLE(db))
571 aflags |= ARC_L2CACHE;
572 if (DBUF_IS_L2COMPRESSIBLE(db))
573 aflags |= ARC_L2COMPRESS;
571
572 SET_BOOKMARK(&zb, db->db_objset->os_dsl_dataset ?
573 db->db_objset->os_dsl_dataset->ds_object : DMU_META_OBJSET,
574 db->db.db_object, db->db_level, db->db_blkid);
575
576 dbuf_add_ref(db, NULL);
577
578 (void) arc_read(zio, spa, db->db_blkptr,

--- 2126 unchanged lines hidden (view full) ---

2705 dr->dr_zio = zio_write(zio, os->os_spa, txg,
2706 db->db_blkptr, NULL, db->db.db_size, &zp,
2707 dbuf_write_nofill_ready, dbuf_write_nofill_done, db,
2708 ZIO_PRIORITY_ASYNC_WRITE,
2709 ZIO_FLAG_MUSTSUCCEED | ZIO_FLAG_NODATA, &zb);
2710 } else {
2711 ASSERT(arc_released(data));
2712 dr->dr_zio = arc_write(zio, os->os_spa, txg,
574
575 SET_BOOKMARK(&zb, db->db_objset->os_dsl_dataset ?
576 db->db_objset->os_dsl_dataset->ds_object : DMU_META_OBJSET,
577 db->db.db_object, db->db_level, db->db_blkid);
578
579 dbuf_add_ref(db, NULL);
580
581 (void) arc_read(zio, spa, db->db_blkptr,

--- 2126 unchanged lines hidden (view full) ---

2708 dr->dr_zio = zio_write(zio, os->os_spa, txg,
2709 db->db_blkptr, NULL, db->db.db_size, &zp,
2710 dbuf_write_nofill_ready, dbuf_write_nofill_done, db,
2711 ZIO_PRIORITY_ASYNC_WRITE,
2712 ZIO_FLAG_MUSTSUCCEED | ZIO_FLAG_NODATA, &zb);
2713 } else {
2714 ASSERT(arc_released(data));
2715 dr->dr_zio = arc_write(zio, os->os_spa, txg,
2713 db->db_blkptr, data, DBUF_IS_L2CACHEABLE(db), &zp,
2714 dbuf_write_ready, dbuf_write_done, db,
2715 ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
2716 db->db_blkptr, data, DBUF_IS_L2CACHEABLE(db),
2717 DBUF_IS_L2COMPRESSIBLE(db), &zp, dbuf_write_ready,
2718 dbuf_write_done, db, ZIO_PRIORITY_ASYNC_WRITE,
2719 ZIO_FLAG_MUSTSUCCEED, &zb);
2716 }
2717}
2720 }
2721}