diff --git a/src/box/memtx_tx.c b/src/box/memtx_tx.c index f871698de9d513c3f2220a3fb9ac6143f26097ca..7697f632e5baa294b33eaa215d874f17ef46addd 100644 --- a/src/box/memtx_tx.c +++ b/src/box/memtx_tx.c @@ -123,12 +123,12 @@ memtx_tx_cause_conflict(struct txn *breaker, struct txn *victim) while (r1 != &breaker->conflict_list && r2 != &victim->conflicted_by_list) { tracker = rlist_entry(r1, struct tx_conflict_tracker, - in_conflict_list); + in_conflict_list); assert(tracker->breaker == breaker); if (tracker->victim == victim) break; tracker = rlist_entry(r2, struct tx_conflict_tracker, - in_conflicted_by_list); + in_conflicted_by_list); assert(tracker->victim == victim); if (tracker->breaker == breaker) break; @@ -146,8 +146,8 @@ memtx_tx_cause_conflict(struct txn *breaker, struct txn *victim) } else { size_t size; tracker = region_alloc_object(&victim->region, - struct tx_conflict_tracker, - &size); + struct tx_conflict_tracker, + &size); if (tracker == NULL) { diag_set(OutOfMemory, size, "tx region", "conflict_tracker"); @@ -596,7 +596,7 @@ memtx_tx_story_find_visible_tuple(struct memtx_story *story, break; /* - * We skip the story as invisible but the corresponding TX + * We skip the story as invisible but if the corresponding TX * is committed our TX can become conflicted. * The conflict will be unavoidable if this statement * relies on old_tuple. If not (it's a replace),