Fix gcc ident pragma warnings

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

diff --git a/module/zfs/sa.c b/module/zfs/sa.c
index 4cb4546..cf87c86 100644 (file)
--- a/module/zfs/sa.c
+++ b/module/zfs/sa.c
@@ -1478,8 +1478,8 @@ sa_find_idx_tab(objset_t *os, dmu_object_type_t bonustype, void *data)
 
        /* Verify header size is consistent with layout information */
        ASSERT(tb);
-       ASSERT(IS_SA_BONUSTYPE(bonustype) &&
-           SA_HDR_SIZE_MATCH_LAYOUT(hdr, tb) || !IS_SA_BONUSTYPE(bonustype) ||
+       ASSERT((IS_SA_BONUSTYPE(bonustype) &&
+           SA_HDR_SIZE_MATCH_LAYOUT(hdr, tb)) || !IS_SA_BONUSTYPE(bonustype) ||
            (IS_SA_BONUSTYPE(bonustype) && hdr->sa_layout_info == 0));
 
        /*
@@ -1545,12 +1545,12 @@ sa_attr_register_sync(sa_handle_t *hdl, dmu_tx_t *tx)
 
        mutex_enter(&sa->sa_lock);
 
-       if (!sa->sa_need_attr_registration || sa->sa_master_obj == NULL) {
+       if (!sa->sa_need_attr_registration || sa->sa_master_obj == 0) {
                mutex_exit(&sa->sa_lock);
                return;
        }
 
-       if (sa->sa_reg_attr_obj == NULL) {
+       if (sa->sa_reg_attr_obj == 0) {
                sa->sa_reg_attr_obj = zap_create(hdl->sa_os,
                    DMU_OT_SA_ATTR_REGISTRATION, DMU_OT_NONE, 0, tx);
                VERIFY(zap_add(hdl->sa_os, sa->sa_master_obj,