Print this page
6047 SPARC boot should support feature@embedded_data
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: Dan McDonald <danmcd@omniti.com>
5959 clean up per-dataset feature count code
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
4370 avoid transmitting holes during zfs send
4371 DMU code clean up
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Approved by: Garrett D'Amore <garrett@damore.org>
Fixup merge results
re 13748 added zpool export -c option
zpool export -c command exports specified pool while keeping its latest
configuration in the cache file for subsequent zpool import -c.

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/zhack/zhack.c
          +++ new/usr/src/cmd/zhack/zhack.c
↓ open down ↓ 82 lines elided ↑ open up ↑
  83   83  }
  84   84  
  85   85  
  86   86  static void
  87   87  fatal(spa_t *spa, void *tag, const char *fmt, ...)
  88   88  {
  89   89          va_list ap;
  90   90  
  91   91          if (spa != NULL) {
  92   92                  spa_close(spa, tag);
  93      -                (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE);
       93 +                (void) spa_export(g_pool, NULL, B_TRUE, B_FALSE, B_FALSE);
  94   94          }
  95   95  
  96   96          va_start(ap, fmt);
  97   97          (void) fprintf(stderr, "%s: ", cmdname);
  98   98          (void) vfprintf(stderr, fmt, ap);
  99   99          va_end(ap);
 100  100          (void) fprintf(stderr, "\n");
 101  101  
 102  102          exit(1);
 103  103  }
↓ open down ↓ 445 lines elided ↑ open up ↑
 549  549          subcommand = argv[0];
 550  550  
 551  551          if (strcmp(subcommand, "feature") == 0) {
 552  552                  rv = zhack_do_feature(argc, argv);
 553  553          } else {
 554  554                  (void) fprintf(stderr, "error: unknown subcommand: %s\n",
 555  555                      subcommand);
 556  556                  usage();
 557  557          }
 558  558  
 559      -        if (!g_readonly && spa_export(g_pool, NULL, B_TRUE, B_FALSE) != 0) {
      559 +        if (!g_readonly &&
      560 +            spa_export(g_pool, NULL, B_TRUE, B_TRUE, B_FALSE) != 0) {
 560  561                  fatal(NULL, FTAG, "pool export failed; "
 561  562                      "changes may not be committed to disk\n");
 562  563          }
 563  564  
 564  565          libzfs_fini(g_zfs);
 565  566          kernel_fini();
 566  567  
 567  568          return (rv);
 568  569  }
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX