Commit 49f154c7 authored by Mike Snitzer's avatar Mike Snitzer

dm thin metadata: remove in-core 'read_only' flag

Leverage the block manager's read_only flag instead of duplicating it;
access with new dm_bm_is_read_only() method.
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent f8ae7525
...@@ -184,7 +184,6 @@ struct dm_pool_metadata { ...@@ -184,7 +184,6 @@ struct dm_pool_metadata {
uint64_t trans_id; uint64_t trans_id;
unsigned long flags; unsigned long flags;
sector_t data_block_size; sector_t data_block_size;
bool read_only:1;
/* /*
* Set if a transaction has to be aborted but the attempt to roll back * Set if a transaction has to be aborted but the attempt to roll back
...@@ -836,7 +835,6 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev, ...@@ -836,7 +835,6 @@ struct dm_pool_metadata *dm_pool_metadata_open(struct block_device *bdev,
init_rwsem(&pmd->root_lock); init_rwsem(&pmd->root_lock);
pmd->time = 0; pmd->time = 0;
INIT_LIST_HEAD(&pmd->thin_devices); INIT_LIST_HEAD(&pmd->thin_devices);
pmd->read_only = false;
pmd->fail_io = false; pmd->fail_io = false;
pmd->bdev = bdev; pmd->bdev = bdev;
pmd->data_block_size = data_block_size; pmd->data_block_size = data_block_size;
...@@ -880,7 +878,7 @@ int dm_pool_metadata_close(struct dm_pool_metadata *pmd) ...@@ -880,7 +878,7 @@ int dm_pool_metadata_close(struct dm_pool_metadata *pmd)
return -EBUSY; return -EBUSY;
} }
if (!pmd->read_only && !pmd->fail_io) { if (!dm_bm_is_read_only(pmd->bm) && !pmd->fail_io) {
r = __commit_transaction(pmd); r = __commit_transaction(pmd);
if (r < 0) if (r < 0)
DMWARN("%s: __commit_transaction() failed, error = %d", DMWARN("%s: __commit_transaction() failed, error = %d",
...@@ -1739,7 +1737,6 @@ int dm_pool_resize_metadata_dev(struct dm_pool_metadata *pmd, dm_block_t new_cou ...@@ -1739,7 +1737,6 @@ int dm_pool_resize_metadata_dev(struct dm_pool_metadata *pmd, dm_block_t new_cou
void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd) void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd)
{ {
down_write(&pmd->root_lock); down_write(&pmd->root_lock);
pmd->read_only = true;
dm_bm_set_read_only(pmd->bm); dm_bm_set_read_only(pmd->bm);
up_write(&pmd->root_lock); up_write(&pmd->root_lock);
} }
...@@ -1747,7 +1744,6 @@ void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd) ...@@ -1747,7 +1744,6 @@ void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd)
void dm_pool_metadata_read_write(struct dm_pool_metadata *pmd) void dm_pool_metadata_read_write(struct dm_pool_metadata *pmd)
{ {
down_write(&pmd->root_lock); down_write(&pmd->root_lock);
pmd->read_only = false;
dm_bm_set_read_write(pmd->bm); dm_bm_set_read_write(pmd->bm);
up_write(&pmd->root_lock); up_write(&pmd->root_lock);
} }
......
...@@ -609,6 +609,12 @@ void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b) ...@@ -609,6 +609,12 @@ void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b)
dm_bufio_prefetch(bm->bufio, b, 1); dm_bufio_prefetch(bm->bufio, b, 1);
} }
bool dm_bm_is_read_only(struct dm_block_manager *bm)
{
return bm->read_only;
}
EXPORT_SYMBOL_GPL(dm_bm_is_read_only);
void dm_bm_set_read_only(struct dm_block_manager *bm) void dm_bm_set_read_only(struct dm_block_manager *bm)
{ {
bm->read_only = true; bm->read_only = true;
......
...@@ -123,6 +123,7 @@ void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b); ...@@ -123,6 +123,7 @@ void dm_bm_prefetch(struct dm_block_manager *bm, dm_block_t b);
* Additionally you should not use dm_bm_unlock_move, however no error will * Additionally you should not use dm_bm_unlock_move, however no error will
* be returned if you do. * be returned if you do.
*/ */
bool dm_bm_is_read_only(struct dm_block_manager *bm);
void dm_bm_set_read_only(struct dm_block_manager *bm); void dm_bm_set_read_only(struct dm_block_manager *bm);
void dm_bm_set_read_write(struct dm_block_manager *bm); void dm_bm_set_read_write(struct dm_block_manager *bm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment