Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis

Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/arc.c
	module/zfs/dmu_objset.c
	module/zfs/dsl_pool.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c

diff --cc cmd/zfs/zfs_main.c
Simple merge

diff --cc lib/libzfs/libzfs_dataset.c
Simple merge

diff --cc module/zcommon/zfs_deleg.c
Simple merge

diff --cc module/zfs/arc.c
index dc2ba588c3df2384ac995a9f8814a3f35e29cc58,d5e5aa544bfd09112f53a37e694208a1b9eb70cd..6d23d4398dbb3e49c9886973f743fd82078ba50e
--- 1/module/zfs/arc.c
--- 2/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@@ -3396,7 -3443,7 +3443,7 @@@ arc_tempreserve_space(uint64_t reserve
         * in order to compress/encrypt/etc the data.  We therefor need to
         * make sure that there is sufficient available memory for this.
         */
-       if ((error = arc_memory_throttle(reserve, txg)))
 -      if (error = arc_memory_throttle(reserve, anon_size, txg))
++      if ((error = arc_memory_throttle(reserve, anon_size, txg)))
                return (error);
  
        /*

diff --cc module/zfs/dbuf.c
Simple merge

diff --cc module/zfs/dmu_objset.c
index b4dc06b3f7ea0fc152e6d92315d2246733542f56,e962c4b88f645f3e4fa0213198d94585cf992cf2..7fd754d11dc2879de8cdc814963197fa32d09e96
--- 1/module/zfs/dmu_objset.c
--- 2/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@@ -925,13 -977,33 +977,33 @@@ dmu_objset_sync(objset_impl_t *os, zio_
        os->os_meta_dnode->dn_zio = zio;
        dnode_sync(os->os_meta_dnode, tx);
  
+       os->os_phys->os_flags = os->os_flags;
+ 
+       if (os->os_userused_dnode &&
+           os->os_userused_dnode->dn_type != DMU_OT_NONE) {
+               os->os_userused_dnode->dn_zio = zio;
+               dnode_sync(os->os_userused_dnode, tx);
+               os->os_groupused_dnode->dn_zio = zio;
+               dnode_sync(os->os_groupused_dnode, tx);
+       }
+ 
        txgoff = tx->tx_txg & TXG_MASK;
  
-       dmu_objset_sync_dnodes(&os->os_free_dnodes[txgoff], tx);
-       dmu_objset_sync_dnodes(&os->os_dirty_dnodes[txgoff], tx);
+       if (dmu_objset_userused_enabled(os)) {
+               newlist = &os->os_synced_dnodes;
+               /*
+                * We must create the list here because it uses the
+                * dn_dirty_link[] of this txg.
+                */
+               list_create(newlist, sizeof (dnode_t),
+                   offsetof(dnode_t, dn_dirty_link[txgoff]));
+       }
+ 
+       dmu_objset_sync_dnodes(&os->os_free_dnodes[txgoff], newlist, tx);
+       dmu_objset_sync_dnodes(&os->os_dirty_dnodes[txgoff], newlist, tx);
  
        list = &os->os_meta_dnode->dn_dirty_records[txgoff];
 -      while (dr = list_head(list)) {
 +      while ((dr = list_head(list))) {
                ASSERT(dr->dr_dbuf->db_level == 0);
                list_remove(list, dr);
                if (dr->dr_zio)

diff --cc module/zfs/dmu_tx.c
Simple merge

diff --cc module/zfs/dnode.c
Simple merge

diff --cc module/zfs/dnode_sync.c
Simple merge

diff --cc module/zfs/dsl_dataset.c
Simple merge

diff --cc module/zfs/dsl_dir.c
Simple merge

diff --cc module/zfs/dsl_pool.c
index 3457bafeaa64cb76625610e0891c33ce1379f8ef,2c5dfca53b2fbd758f35b353e9b5a5f9bce1cde4..f2eb2386338cfb7d83587173b4cdf91a0327c331
--- 1/module/zfs/dsl_pool.c
--- 2/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@@ -296,12 -301,17 +301,17 @@@ dsl_pool_sync(dsl_pool_t *dp, uint64_t 
        tx = dmu_tx_create_assigned(dp, txg);
  
        dp->dp_read_overhead = 0;
+       start = gethrtime();
+ 
        zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
 -      while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
 +      while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg))) {
-               if (!list_link_active(&ds->ds_synced_link))
-                       list_insert_tail(&dp->dp_synced_datasets, ds);
-               else
-                       dmu_buf_rele(ds->ds_dbuf, ds);
+               /*
+                * We must not sync any non-MOS datasets twice, because
+                * we may have taken a snapshot of them.  However, we
+                * may sync newly-created datasets on pass 2.
+                */
+               ASSERT(!list_link_active(&ds->ds_synced_link));
+               list_insert_tail(&dp->dp_synced_datasets, ds);
                dsl_dataset_sync(ds, zio, tx);
        }
        DTRACE_PROBE(pool_sync__1setup);
@@@ -312,8 -321,32 +321,32 @@@
        ASSERT(err == 0);
        DTRACE_PROBE(pool_sync__2rootzio);
  
-       while ((dstg = txg_list_remove(&dp->dp_sync_tasks, txg)))
+       for (ds = list_head(&dp->dp_synced_datasets); ds;
+           ds = list_next(&dp->dp_synced_datasets, ds))
+               dmu_objset_do_userquota_callbacks(ds->ds_user_ptr, tx);
+ 
+       /*
+        * Sync the datasets again to push out the changes due to
+        * userquota updates.  This must be done before we process the
+        * sync tasks, because that could cause a snapshot of a dataset
+        * whose ds_bp will be rewritten when we do this 2nd sync.
+        */
+       zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
 -      while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
++      while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg))) {
+               ASSERT(list_link_active(&ds->ds_synced_link));
+               dmu_buf_rele(ds->ds_dbuf, ds);
+               dsl_dataset_sync(ds, zio, tx);
+       }
+       err = zio_wait(zio);
+ 
 -      while (dstg = txg_list_remove(&dp->dp_sync_tasks, txg)) {
++      while ((dstg = txg_list_remove(&dp->dp_sync_tasks, txg))) {
+               /*
+                * No more sync tasks should have been added while we
+                * were syncing.
+                */
+               ASSERT(spa_sync_pass(dp->dp_spa) == 1);
                dsl_sync_task_group_sync(dstg, tx);
+       }
        DTRACE_PROBE(pool_sync__3task);
  
        start = gethrtime();

diff --cc module/zfs/spa.c
index 8182eae4bd98f1826077189bfbf139489f4e7da4,6a95b399bfe6e70af12456ee7011ef99dc4c3980..912a8daebe7b1f65e4a6de69b26e9c75f9e660ed
--- 1/module/zfs/spa.c
--- 2/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -2462,86 -2638,7 +2638,6 @@@ spa_import(const char *pool, nvlist_t *
        return (0);
  }
  
- /*
-  * Import a root pool.
-  *
-  * For x86. devpath_list will consist of devid and/or physpath name of
-  * the vdev (e.g. "id1,sd@SSEAGATE..." or "/pci@1f,0/ide@d/disk@0,0:a").
-  * The GRUB "findroot" command will return the vdev we should boot.
-  *
-  * For Sparc, devpath_list consists the physpath name of the booting device
-  * no matter the rootpool is a single device pool or a mirrored pool.
-  * e.g.
-  *    "/pci@1f,0/ide@d/disk@0,0:a"
-  */
- int
- spa_import_rootpool(char *devpath, char *devid)
- {
-       nvlist_t *conf = NULL;
-       char *pname;
-       int error;
- 
-       /*
-        * Get the vdev pathname and configuation from the most
-        * recently updated vdev (highest txg).
-        */
-       if ((error = spa_get_rootconf(devpath, devid, &conf)))
-               goto msg_out;
- 
-       /*
-        * Add type "root" vdev to the config.
-        */
-       spa_build_rootpool_config(conf);
- 
-       VERIFY(nvlist_lookup_string(conf, ZPOOL_CONFIG_POOL_NAME, &pname) == 0);
- 
-       /*
-        * We specify 'allowfaulted' for this to be treated like spa_open()
-        * instead of spa_import().  This prevents us from marking vdevs as
-        * persistently unavailable, and generates FMA ereports as if it were a
-        * pool open, not import.
-        */
-       error = spa_import_common(pname, conf, NULL, B_TRUE, B_TRUE);
-       ASSERT(error != EEXIST);
- 
-       nvlist_free(conf);
-       return (error);
- 
- msg_out:
-       cmn_err(CE_NOTE, "\n"
-           "  ***************************************************  \n"
-           "  *  This device is not bootable!                   *  \n"
-           "  *  It is either offlined or detached or faulted.  *  \n"
-           "  *  Please try to boot from a different device.    *  \n"
-           "  ***************************************************  ");
- 
-       return (error);
- }
- #endif
- 
- /*
-  * Import a non-root pool into the system.
-  */
- int
- spa_import(const char *pool, nvlist_t *config, nvlist_t *props)
- {
-       return (spa_import_common(pool, config, props, B_FALSE, B_FALSE));
- }
- 
- int
- spa_import_faulted(const char *pool, nvlist_t *config, nvlist_t *props)
- {
-       return (spa_import_common(pool, config, props, B_FALSE, B_TRUE));
- }
- 
--
  /*
   * This (illegal) pool name is used when temporarily importing a spa_t in order
   * to get the vdev stats associated with the imported devices.

diff --cc module/zfs/vdev.c
Simple merge

diff --cc module/zfs/zap_micro.c
Simple merge

diff --cc module/zfs/zfs_fuid.c
Simple merge

diff --cc module/zfs/zfs_ioctl.c
index e7c5ddc2603473cca345b3194e976b6a512f76e7,07dd03c3544579a21f3a95156f80969da884a674..e388654cf809ac843decfe531011bc68538072ad
--- 1/module/zfs/zfs_ioctl.c
--- 2/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@@ -748,8 -892,8 +892,8 @@@ zfs_ioc_pool_create(zfs_cmd_t *zc
        nvlist_t *zplprops = NULL;
        char *buf;
  
-       if ((error = get_nvlist(zc->zc_nvlist_conf,
-                               zc->zc_nvlist_conf_size, &config)))
 -      if (error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
 -          zc->zc_iflags, &config))
++      if ((error = get_nvlist(zc->zc_nvlist_conf, zc->zc_nvlist_conf_size,
++          zc->zc_iflags, &config)))
                return (error);
  
        if (zc->zc_nvlist_src_size != 0 && (error =

diff --cc module/zfs/zio.c
Simple merge