Fix gcc ident pragma warnings

[zfs.git] / module / zfs / spa_misc.c

diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c
index 52af7fc..228ed13 100644 (file)
--- a/module/zfs/spa_misc.c
+++ b/module/zfs/spa_misc.c
@@ -255,7 +255,9 @@ int zfs_recover = 0;
 static void
 spa_config_lock_init(spa_t *spa)
 {
-       for (int i = 0; i < SCL_LOCKS; i++) {
+       int i;
+
+       for (i = 0; i < SCL_LOCKS; i++) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                mutex_init(&scl->scl_lock, NULL, MUTEX_DEFAULT, NULL);
                cv_init(&scl->scl_cv, NULL, CV_DEFAULT, NULL);
@@ -268,7 +270,9 @@ spa_config_lock_init(spa_t *spa)
 static void
 spa_config_lock_destroy(spa_t *spa)
 {
-       for (int i = 0; i < SCL_LOCKS; i++) {
+       int i;
+
+       for (i = 0; i < SCL_LOCKS; i++) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                mutex_destroy(&scl->scl_lock);
                cv_destroy(&scl->scl_cv);
@@ -281,7 +285,9 @@ spa_config_lock_destroy(spa_t *spa)
 int
 spa_config_tryenter(spa_t *spa, int locks, void *tag, krw_t rw)
 {
-       for (int i = 0; i < SCL_LOCKS; i++) {
+       int i;
+
+       for (i = 0; i < SCL_LOCKS; i++) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                if (!(locks & (1 << i)))
                        continue;
@@ -311,8 +317,9 @@ void
 spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw)
 {
        int wlocks_held = 0;
+       int i;
 
-       for (int i = 0; i < SCL_LOCKS; i++) {
+       for (i = 0; i < SCL_LOCKS; i++) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                if (scl->scl_writer == curthread)
                        wlocks_held |= (1 << i);
@@ -341,7 +348,9 @@ spa_config_enter(spa_t *spa, int locks, void *tag, krw_t rw)
 void
 spa_config_exit(spa_t *spa, int locks, void *tag)
 {
-       for (int i = SCL_LOCKS - 1; i >= 0; i--) {
+       int i;
+
+       for (i = SCL_LOCKS - 1; i >= 0; i--) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                if (!(locks & (1 << i)))
                        continue;
@@ -360,9 +369,9 @@ spa_config_exit(spa_t *spa, int locks, void *tag)
 int
 spa_config_held(spa_t *spa, int locks, krw_t rw)
 {
-       int locks_held = 0;
+       int i, locks_held = 0;
 
-       for (int i = 0; i < SCL_LOCKS; i++) {
+       for (i = 0; i < SCL_LOCKS; i++) {
                spa_config_lock_t *scl = &spa->spa_config_lock[i];
                if (!(locks & (1 << i)))
                        continue;
@@ -424,6 +433,7 @@ spa_add(const char *name, nvlist_t *config, const char *altroot)
 {
        spa_t *spa;
        spa_config_dirent_t *dp;
+       int t;
 
        ASSERT(MUTEX_HELD(&spa_namespace_lock));
 
@@ -444,7 +454,7 @@ spa_add(const char *name, nvlist_t *config, const char *altroot)
        cv_init(&spa->spa_scrub_io_cv, NULL, CV_DEFAULT, NULL);
        cv_init(&spa->spa_suspend_cv, NULL, CV_DEFAULT, NULL);
 
-       for (int t = 0; t < TXG_SIZE; t++)
+       for (t = 0; t < TXG_SIZE; t++)
                bplist_create(&spa->spa_free_bplist[t]);
 
        (void) strlcpy(spa->spa_name, name, sizeof (spa->spa_name));
@@ -478,6 +488,9 @@ spa_add(const char *name, nvlist_t *config, const char *altroot)
        dp->scd_path = altroot ? NULL : spa_strdup(spa_config_path);
        list_insert_head(&spa->spa_config_list, dp);
 
+       VERIFY(nvlist_alloc(&spa->spa_load_info, NV_UNIQUE_NAME,
+           KM_SLEEP) == 0);
+
        if (config != NULL)
                VERIFY(nvlist_dup(config, &spa->spa_config, 0) == 0);
 
@@ -493,6 +506,7 @@ void
 spa_remove(spa_t *spa)
 {
        spa_config_dirent_t *dp;
+       int t;
 
        ASSERT(MUTEX_HELD(&spa_namespace_lock));
        ASSERT(spa->spa_state == POOL_STATE_UNINITIALIZED);
@@ -516,13 +530,14 @@ spa_remove(spa_t *spa)
 
        list_destroy(&spa->spa_config_list);
 
+       nvlist_free(spa->spa_load_info);
        spa_config_set(spa, NULL);
 
        refcount_destroy(&spa->spa_refcount);
 
        spa_config_lock_destroy(spa);
 
-       for (int t = 0; t < TXG_SIZE; t++)
+       for (t = 0; t < TXG_SIZE; t++)
                bplist_destroy(&spa->spa_free_bplist[t]);
 
        cv_destroy(&spa->spa_async_cv);
@@ -873,10 +888,9 @@ spa_vdev_config_enter(spa_t *spa)
 void
 spa_vdev_config_exit(spa_t *spa, vdev_t *vd, uint64_t txg, int error, char *tag)
 {
-       ASSERT(MUTEX_HELD(&spa_namespace_lock));
-
        int config_changed = B_FALSE;
 
+       ASSERT(MUTEX_HELD(&spa_namespace_lock));
        ASSERT(txg > spa_last_synced_txg(spa));
 
        spa->spa_pending_vdev = NULL;
@@ -886,10 +900,6 @@ spa_vdev_config_exit(spa_t *spa, vdev_t *vd, uint64_t txg, int error, char *tag)
         */
        vdev_dtl_reassess(spa->spa_root_vdev, 0, 0, B_FALSE);
 
-       /*
-        * If the config changed, notify the scrub that it must restart.
-        * This will initiate a resilver if needed.
-        */
        if (error == 0 && !list_is_empty(&spa->spa_config_dirty_list)) {
                config_changed = B_TRUE;
                spa->spa_config_generation++;
@@ -1078,12 +1088,12 @@ spa_rename(const char *name, const char *newname)
 }
 
 /*
- * Determine whether a pool with given pool_guid exists.  If device_guid is
- * non-zero, determine whether the pool exists *and* contains a device with the
- * specified device_guid.
+ * Return the spa_t associated with given pool_guid, if it exists.  If
+ * device_guid is non-zero, determine whether the pool exists *and* contains
+ * a device with the specified device_guid.
  */
-boolean_t
-spa_guid_exists(uint64_t pool_guid, uint64_t device_guid)
+spa_t *
+spa_by_guid(uint64_t pool_guid, uint64_t device_guid)
 {
        spa_t *spa;
        avl_tree_t *t = &spa_namespace_avl;
@@ -1114,7 +1124,16 @@ spa_guid_exists(uint64_t pool_guid, uint64_t device_guid)
                }
        }
 
-       return (spa != NULL);
+       return (spa);
+}
+
+/*
+ * Determine whether a pool with the given pool_guid exists.
+ */
+boolean_t
+spa_guid_exists(uint64_t pool_guid, uint64_t device_guid)
+{
+       return (spa_by_guid(pool_guid, device_guid) != NULL);
 }
 
 char *
@@ -1445,8 +1464,9 @@ uint64_t
 bp_get_dsize_sync(spa_t *spa, const blkptr_t *bp)
 {
        uint64_t dsize = 0;
+       int d;
 
-       for (int d = 0; d < SPA_DVAS_PER_BP; d++)
+       for (d = 0; d < SPA_DVAS_PER_BP; d++)
                dsize += dva_get_dsize_sync(spa, &bp->blk_dva[d]);
 
        return (dsize);
@@ -1456,10 +1476,11 @@ uint64_t
 bp_get_dsize(spa_t *spa, const blkptr_t *bp)
 {
        uint64_t dsize = 0;
+       int d;
 
        spa_config_enter(spa, SCL_VDEV, FTAG, RW_READER);
 
-       for (int d = 0; d < SPA_DVAS_PER_BP; d++)
+       for (d = 0; d < SPA_DVAS_PER_BP; d++)
                dsize += dva_get_dsize_sync(spa, &bp->blk_dva[d]);
 
        spa_config_exit(spa, SCL_VDEV, FTAG);