Author: delphij
Date: Sat Oct 4 07:49:06 2014
New Revision: 272500
URL: https://svnweb.freebsd.org/changeset/base/272500
Log:
5150 zfs clone of a defer_destroy snapshot causes strangeness
Reviewed by: Christopher Siden <christopher.si...@delphix.com>
Reviewed by: George Wilson <george.wil...@delphix.com>
Reviewed by: Max Grossman <max.gross...@delphix.com>
Reviewed by: Saso Kiselkov <skiselkov...@gmail.com>
Reviewed by: Richard Elling <richard.ell...@gmail.com>
Approved by: Robert Mustacchi <r...@joyent.com>
Author: Matthew Ahrens <mahr...@delphix.com>
illumos/illumos-gate@42fcb65ea4f2c6f8cc5a3c6142a486cb49871fd2
Modified:
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Oct 4
07:38:59 2014 (r272499)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Sat Oct 4
07:49:06 2014 (r272500)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
* Copyright (c) 2014, Joyent, Inc. All rights reserved.
* Copyright (c) 2014 RackTop Systems.
*/
@@ -692,7 +692,13 @@ dsl_dataset_create_sync_dd(dsl_dir_t *dd
dsphys->ds_uncompressed_bytes =
origin->ds_phys->ds_uncompressed_bytes;
dsphys->ds_bp = origin->ds_phys->ds_bp;
- dsphys->ds_flags |= origin->ds_phys->ds_flags;
+
+ /*
+ * Inherit flags that describe the dataset's contents
+ * (INCONSISTENT) or properties (Case Insensitive).
+ */
+ dsphys->ds_flags |= origin->ds_phys->ds_flags &
+ (DS_FLAG_INCONSISTENT | DS_FLAG_CI_DATASET);
dmu_buf_will_dirty(origin->ds_dbuf, tx);
origin->ds_phys->ds_num_children++;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
