Print this page
2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/zfs_vfsops.c
          +++ new/usr/src/uts/common/fs/zfs/zfs_vfsops.c
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright (c) 2012 by Delphix. All rights reserved.
  23   24   */
  24   25  
  25   26  /* Portions Copyright 2010 Robert Milkowski */
  26   27  
  27   28  #include <sys/types.h>
  28   29  #include <sys/param.h>
  29   30  #include <sys/systm.h>
  30   31  #include <sys/sysmacros.h>
  31   32  #include <sys/kmem.h>
  32   33  #include <sys/pathname.h>
↓ open down ↓ 2208 lines elided ↑ open up ↑
2241 2242                      DMU_OT_NONE, 0, tx);
2242 2243  
2243 2244                  error = zap_add(os, MASTER_NODE_OBJ,
2244 2245                      ZFS_SA_ATTRS, 8, 1, &sa_obj, tx);
2245 2246                  ASSERT3U(error, ==, 0);
2246 2247  
2247 2248                  VERIFY(0 == sa_set_sa_object(os, sa_obj));
2248 2249                  sa_register_update_callback(os, zfs_sa_upgrade);
2249 2250          }
2250 2251  
2251      -        spa_history_log_internal(LOG_DS_UPGRADE,
2252      -            dmu_objset_spa(os), tx, "oldver=%llu newver=%llu dataset = %llu",
2253      -            zfsvfs->z_version, newvers, dmu_objset_id(os));
     2252 +        spa_history_log_internal_ds(dmu_objset_ds(os), "upgrade", tx,
     2253 +            "from %llu to %llu", zfsvfs->z_version, newvers);
2254 2254  
2255 2255          dmu_tx_commit(tx);
2256 2256  
2257 2257          zfsvfs->z_version = newvers;
2258 2258  
2259 2259          zfs_set_fuid_feature(zfsvfs);
2260 2260  
2261 2261          return (0);
2262 2262  }
2263 2263  
↓ open down ↓ 54 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX