From ba41b02e8e6fed4380495d7b698842427dfc1cb3 Mon Sep 17 00:00:00 2001
From: kasiawasiuta <katarzyna.wasiuta@intel.com>
Date: Thu, 26 Sep 2019 15:17:39 +0200
Subject: [PATCH] obj: remove unreachable code
---
src/libpmemobj/obj.c | 1 -
src/libpmemobj/tx.c | 12 ------------
2 files changed, 13 deletions(-)
diff --git a/src/libpmemobj/obj.c b/src/libpmemobj/obj.c
index e3fdf9cba..4f725da7c 100644
--- a/src/libpmemobj/obj.c
+++ b/src/libpmemobj/obj.c
@@ -1269,7 +1269,6 @@ obj_runtime_init(PMEMobjpool *pop, int rdonly, int boot, unsigned nlanes)
ERR("!ravl_new_sized");
goto err_user_buffers_map;
}
- ASSERTne(pop->ulog_user_buffers.map, NULL);
pop->ulog_user_buffers.verify = 0;
/*
diff --git a/src/libpmemobj/tx.c b/src/libpmemobj/tx.c
index 045e5128d..dd1ed8d29 100644
--- a/src/libpmemobj/tx.c
+++ b/src/libpmemobj/tx.c
@@ -1783,18 +1783,6 @@ pmemobj_tx_log_append_buffer(enum pobj_log_type type, void *addr, size_t size)
err = tx_construct_user_buffer(tx, addr, size, type,
PMDK_SLIST_NEXT(td, tx_entry) == NULL);
- if (err)
- goto err_abort;
-
- PMEMOBJ_API_END();
- return 0;
-
-err_abort:
- if (tx->stage == TX_STAGE_WORK)
- err = obj_tx_abort_err(err);
- else
- tx->stage = TX_STAGE_ONABORT;
-
PMEMOBJ_API_END();
return err;
}
--
GitLab