Permalink
Browse files

Illumos #1346: zfs incremental receive may leave behind temporary clones

1356 zfs dataset prefetch code not working
Reviewed by: Matthew Ahrens <matt@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Gordon Ross <gwr@nexenta.com>
  • Loading branch information...
1 parent 2ce9d0e commit 261098908fcb99e5ce7add8e4d24de3a07443d48 @ryao committed Apr 8, 2012
Showing with 5 additions and 2 deletions.
  1. +5 −2 module/zfs/zfs_ioctl.c
@@ -20,6 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright 2011 Martin Matuska
*/
#include <sys/types.h>
@@ -1921,8 +1922,10 @@ zfs_ioc_dataset_list_next(zfs_cmd_t *zc)
uint64_t cookie = 0;
int len = sizeof (zc->zc_name) - (p - zc->zc_name);
- while (dmu_dir_list_next(os, len, p, NULL, &cookie) == 0)
- (void) dmu_objset_prefetch(p, NULL);
+ while (dmu_dir_list_next(os, len, p, NULL, &cookie) == 0) {
+ if (!dataset_name_hidden(zc->zc_name))
+ (void) dmu_objset_prefetch(zc->zc_name, NULL);
+ }
}
do {

0 comments on commit 2610989

Please sign in to comment.