Illumos #3137 L2ARC compression

[zfs.git] / module / zfs / dmu_objset.c

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index a34584e..52d55d5 100644 (file)
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -274,14 +275,11 @@ dmu_objset_open_impl(spa_t *spa, dsl_dataset_t *ds, blkptr_t *bp,
 
                if (DMU_OS_IS_L2CACHEABLE(os))
                        aflags |= ARC_L2CACHE;
+               if (DMU_OS_IS_L2COMPRESSIBLE(os))
+                       aflags |= ARC_L2COMPRESS;
 
                dprintf_bp(os->os_rootbp, "reading %s", "");
-               /*
-                * XXX when bprewrite scrub can change the bp,
-                * and this is called from dmu_objset_open_ds_os, the bp
-                * could change, and we'll need a lock.
-                */
-               err = dsl_read_nolock(NULL, spa, os->os_rootbp,
+               err = arc_read(NULL, spa, os->os_rootbp,
                    arc_getbuf_func, &os->os_phys_buf,
                    ZIO_PRIORITY_SYNC_READ, ZIO_FLAG_CANFAIL, &aflags, &zb);
                if (err) {
@@ -848,7 +846,7 @@ snapshot_check(void *arg1, void *arg2, dmu_tx_t *tx)
                if (strlen(sn->htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
                        return (E2BIG);
 
-               sn->ha = kmem_alloc(sizeof (struct dsl_ds_holdarg), KM_SLEEP);
+               sn->ha = kmem_alloc(sizeof(struct dsl_ds_holdarg), KM_PUSHPAGE);
                sn->ha->temphold = B_TRUE;
                sn->ha->htag = sn->htag;
        }
@@ -1119,15 +1117,15 @@ dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
        SET_BOOKMARK(&zb, os->os_dsl_dataset ?
            os->os_dsl_dataset->ds_object : DMU_META_OBJSET,
            ZB_ROOT_OBJECT, ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
-       VERIFY3U(0, ==, arc_release_bp(os->os_phys_buf, &os->os_phys_buf,
-           os->os_rootbp, os->os_spa, &zb));
+       arc_release(os->os_phys_buf, &os->os_phys_buf);
 
        dmu_write_policy(os, NULL, 0, 0, &zp);
 
        zio = arc_write(pio, os->os_spa, tx->tx_txg,
-           os->os_rootbp, os->os_phys_buf, DMU_OS_IS_L2CACHEABLE(os), &zp,
-           dmu_objset_write_ready, dmu_objset_write_done, os,
-           ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
+           os->os_rootbp, os->os_phys_buf, DMU_OS_IS_L2CACHEABLE(os),
+           DMU_OS_IS_L2COMPRESSIBLE(os), &zp, dmu_objset_write_ready,
+           dmu_objset_write_done, os, ZIO_PRIORITY_ASYNC_WRITE,
+           ZIO_FLAG_MUSTSUCCEED, &zb);
 
        /*
         * Sync special dnodes - the parent IO for the sync is the root block
@@ -1182,17 +1180,6 @@ dmu_objset_is_dirty(objset_t *os, uint64_t txg)
            !list_is_empty(&os->os_free_dnodes[txg & TXG_MASK]));
 }
 
-boolean_t
-dmu_objset_is_dirty_anywhere(objset_t *os)
-{
-       int t;
-
-       for (t = 0; t < TXG_SIZE; t++)
-               if (dmu_objset_is_dirty(os, t))
-                       return (B_TRUE);
-       return (B_FALSE);
-}
-
 static objset_used_cb_t *used_cbs[DMU_OST_NUMTYPES];
 
 void
@@ -1584,39 +1571,10 @@ dmu_snapshot_list_next(objset_t *os, int namelen, char *name,
        return (0);
 }
 
-/*
- * Determine the objset id for a given snapshot name.
- */
 int
-dmu_snapshot_id(objset_t *os, const char *snapname, uint64_t *idp)
+dmu_snapshot_lookup(objset_t *os, const char *name, uint64_t *value)
 {
-       dsl_dataset_t *ds = os->os_dsl_dataset;
-       zap_cursor_t cursor;
-       zap_attribute_t attr;
-       int error;
-
-       if (ds->ds_phys->ds_snapnames_zapobj == 0)
-               return (ENOENT);
-
-       zap_cursor_init(&cursor, ds->ds_dir->dd_pool->dp_meta_objset,
-           ds->ds_phys->ds_snapnames_zapobj);
-
-       error = zap_cursor_move_to_key(&cursor, snapname, MT_EXACT);
-       if (error) {
-               zap_cursor_fini(&cursor);
-               return (error);
-       }
-
-       error = zap_cursor_retrieve(&cursor, &attr);
-       if (error) {
-               zap_cursor_fini(&cursor);
-               return (error);
-       }
-
-       *idp = attr.za_first_integer;
-       zap_cursor_fini(&cursor);
-
-       return (0);
+       return dsl_dataset_snap_lookup(os->os_dsl_dataset, name, value);
 }
 
 int
@@ -1712,7 +1670,7 @@ dmu_objset_find_spa(spa_t *spa, const char *name,
        }
 
        thisobj = dd->dd_phys->dd_head_dataset_obj;
-       attr = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP);
+       attr = kmem_alloc(sizeof (zap_attribute_t), KM_PUSHPAGE);
        dp = dd->dd_pool;
 
        /*
@@ -1805,7 +1763,7 @@ dmu_objset_prefetch(const char *name, void *arg)
                        SET_BOOKMARK(&zb, ds->ds_object, ZB_ROOT_OBJECT,
                            ZB_ROOT_LEVEL, ZB_ROOT_BLKID);
 
-                       (void) dsl_read_nolock(NULL, dsl_dataset_get_spa(ds),
+                       (void) arc_read(NULL, dsl_dataset_get_spa(ds),
                            &ds->ds_phys->ds_bp, NULL, NULL,
                            ZIO_PRIORITY_ASYNC_READ,
                            ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE,