diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-14 14:49:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-14 14:49:20 +0200 |
| commit | ae90f8431ba80383f75810248ddaaa9d2c6fd09f (patch) | |
| tree | 8f4e6f29d991188b01db6695c3229f6201cc6121 /storage/innobase/fsp | |
| parent | c454b8964c10301dceab6d1a5489350a0f8fbf9c (diff) | |
| parent | 89ae01fd0085cf0d1af272eca545e49fdadf4538 (diff) | |
| download | mariadb-git-ae90f8431ba80383f75810248ddaaa9d2c6fd09f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/fsp')
| -rw-r--r-- | storage/innobase/fsp/fsp0fsp.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc index 039da3eb2bd..691f86c11cc 100644 --- a/storage/innobase/fsp/fsp0fsp.cc +++ b/storage/innobase/fsp/fsp0fsp.cc @@ -542,7 +542,7 @@ void fsp_header_init(fil_space_t* space, ulint size, mtr_t* mtr) const page_id_t page_id(space->id, 0); const ulint zip_size = space->zip_size(); - mtr_x_lock(&space->latch, mtr); + mtr_x_lock_space(space, mtr); buf_block_t* block = buf_page_create(page_id, zip_size, mtr); buf_page_get(page_id, zip_size, RW_SX_LATCH, mtr); buf_block_dbg_add_level(block, SYNC_FSP_PAGE); @@ -1769,7 +1769,7 @@ fseg_create( ut_ad(byte_offset + FSEG_HEADER_SIZE <= srv_page_size - FIL_PAGE_DATA_END); - mtr_x_lock(&space->latch, mtr); + mtr_x_lock_space(space, mtr); ut_d(space->modify_check(*mtr)); if (page != 0) { @@ -2452,7 +2452,7 @@ fsp_reserve_free_extents( ut_ad(mtr); *n_reserved = n_ext; - mtr_x_lock(&space->latch, mtr); + mtr_x_lock_space(space, mtr); const ulint physical_size = space->physical_size(); space_header = fsp_get_space_header(space, mtr); @@ -2735,7 +2735,7 @@ fseg_free_page_func( DBUG_ENTER("fseg_free_page"); fseg_inode_t* seg_inode; buf_block_t* iblock; - mtr_x_lock(&space->latch, mtr); + mtr_x_lock_space(space, mtr); DBUG_LOG("fseg_free_page", "space_id: " << space->id << ", page_no: " << offset); @@ -2765,7 +2765,7 @@ fseg_page_is_free(fil_space_t* space, unsigned page) page); mtr.start(); - mtr_s_lock(&space->latch, &mtr); + mtr_s_lock_space(space, &mtr); if (page >= space->free_limit || page >= space->size_in_header) { is_free = true; |