Fix typo/etc in module/zfs/zfs_ctldir.c

[mirror_zfs.git] / module / zfs / sa.c

diff --git a/module/zfs/sa.c b/module/zfs/sa.c
index 5b6b90642d6f9d31bf9f93dfa6f8afc6fada1c44..56a606962a7f97f3cf8038a5474a05b1f55bc0b8 100644 (file)
--- a/module/zfs/sa.c
+++ b/module/zfs/sa.c
@@ -150,21 +150,26 @@ arc_byteswap_func_t sa_bswap_table[] = {
        zfs_acl_byteswap,
 };
 
-#define        SA_COPY_DATA(f, s, t, l) \
-       { \
-               if (f == NULL) { \
-                       if (l == 8) { \
-                               *(uint64_t *)t = *(uint64_t *)s; \
-                       } else if (l == 16) { \
-                               *(uint64_t *)t = *(uint64_t *)s; \
-                               *(uint64_t *)((uintptr_t)t + 8) = \
-                                   *(uint64_t *)((uintptr_t)s + 8); \
-                       } else { \
-                               bcopy(s, t, l); \
-                       } \
-               } else \
-                       sa_copy_data(f, s, t, l); \
-       }
+#ifdef HAVE_EFFICIENT_UNALIGNED_ACCESS
+#define        SA_COPY_DATA(f, s, t, l)                                \
+do {                                                           \
+       if (f == NULL) {                                        \
+               if (l == 8) {                                   \
+                       *(uint64_t *)t = *(uint64_t *)s;        \
+               } else if (l == 16) {                           \
+                       *(uint64_t *)t = *(uint64_t *)s;        \
+                       *(uint64_t *)((uintptr_t)t + 8) =       \
+                           *(uint64_t *)((uintptr_t)s + 8);    \
+               } else {                                        \
+                       bcopy(s, t, l);                         \
+               }                                               \
+       } else {                                                \
+               sa_copy_data(f, s, t, l);                       \
+       }                                                       \
+} while (0)
+#else
+#define        SA_COPY_DATA(f, s, t, l)        sa_copy_data(f, s, t, l)
+#endif
 
 /*
  * This table is fixed and cannot be changed.  Its purpose is to
@@ -698,7 +703,7 @@ sa_build_layouts(sa_handle_t *hdl, sa_bulk_attr_t *attr_desc, int attr_count,
                boolean_t dummy;
 
                if (hdl->sa_spill == NULL) {
-                       VERIFY(dmu_spill_hold_by_bonus(hdl->sa_bonus, NULL,
+                       VERIFY(dmu_spill_hold_by_bonus(hdl->sa_bonus, 0, NULL,
                            &hdl->sa_spill) == 0);
                }
                dmu_buf_will_dirty(hdl->sa_spill, tx);
@@ -1131,7 +1136,7 @@ sa_tear_down(objset_t *os)
            avl_destroy_nodes(&sa->sa_layout_hash_tree, &cookie))) {
                sa_idx_tab_t *tab;
                while ((tab = list_head(&layout->lot_idx_tab))) {
-                       ASSERT(refcount_count(&tab->sa_refcount));
+                       ASSERT(zfs_refcount_count(&tab->sa_refcount));
                        sa_idx_tab_rele(os, tab);
                }
        }
@@ -1284,7 +1289,13 @@ sa_build_index(sa_handle_t *hdl, sa_buf_type_t buftype)
        /* only check if not old znode */
        if (IS_SA_BONUSTYPE(bonustype) && sa_hdr_phys->sa_magic != SA_MAGIC &&
            sa_hdr_phys->sa_magic != 0) {
-               VERIFY(BSWAP_32(sa_hdr_phys->sa_magic) == SA_MAGIC);
+               if (BSWAP_32(sa_hdr_phys->sa_magic) != SA_MAGIC) {
+                       mutex_exit(&sa->sa_lock);
+                       zfs_dbgmsg("Buffer Header: %x != SA_MAGIC:%x "
+                           "object=%#llx\n", sa_hdr_phys->sa_magic, SA_MAGIC,
+                           db->db.db_object);
+                       return (SET_ERROR(EIO));
+               }
                sa_byteswap(hdl, buftype);
        }
 
@@ -1316,13 +1327,13 @@ sa_idx_tab_rele(objset_t *os, void *arg)
                return;
 
        mutex_enter(&sa->sa_lock);
-       if (refcount_remove(&idx_tab->sa_refcount, NULL) == 0) {
+       if (zfs_refcount_remove(&idx_tab->sa_refcount, NULL) == 0) {
                list_remove(&idx_tab->sa_layout->lot_idx_tab, idx_tab);
                if (idx_tab->sa_variable_lengths)
                        kmem_free(idx_tab->sa_variable_lengths,
                            sizeof (uint16_t) *
                            idx_tab->sa_layout->lot_var_sizes);
-               refcount_destroy(&idx_tab->sa_refcount);
+               zfs_refcount_destroy(&idx_tab->sa_refcount);
                kmem_free(idx_tab->sa_idx_tab,
                    sizeof (uint32_t) * sa->sa_num_attrs);
                kmem_free(idx_tab, sizeof (sa_idx_tab_t));
@@ -1336,7 +1347,7 @@ sa_idx_tab_hold(objset_t *os, sa_idx_tab_t *idx_tab)
        ASSERTV(sa_os_t *sa = os->os_sa);
 
        ASSERT(MUTEX_HELD(&sa->sa_lock));
-       (void) refcount_add(&idx_tab->sa_refcount, NULL);
+       (void) zfs_refcount_add(&idx_tab->sa_refcount, NULL);
 }
 
 void
@@ -1737,7 +1748,7 @@ sa_find_idx_tab(objset_t *os, dmu_object_type_t bonustype, sa_hdr_phys_t *hdr)
        idx_tab->sa_idx_tab =
            kmem_zalloc(sizeof (uint32_t) * sa->sa_num_attrs, KM_SLEEP);
        idx_tab->sa_layout = tb;
-       refcount_create(&idx_tab->sa_refcount);
+       zfs_refcount_create(&idx_tab->sa_refcount);
        if (tb->lot_var_sizes)
                idx_tab->sa_variable_lengths = kmem_alloc(sizeof (uint16_t) *
                    tb->lot_var_sizes, KM_SLEEP);