| .. | .. |
|---|
| 28 | 28 | * |
|---|
| 29 | 29 | * - A hierarchical btree, with 2 levels which effectively maps (thin |
|---|
| 30 | 30 | * dev id, virtual block) -> block_time. Block time is a 64-bit |
|---|
| 31 | | - * field holding the time in the low 24 bits, and block in the top 48 |
|---|
| 31 | + * field holding the time in the low 24 bits, and block in the top 40 |
|---|
| 32 | 32 | * bits. |
|---|
| 33 | 33 | * |
|---|
| 34 | 34 | * BTrees consist solely of btree_nodes, that fill a block. Some are |
|---|
| .. | .. |
|---|
| 189 | 189 | sector_t data_block_size; |
|---|
| 190 | 190 | |
|---|
| 191 | 191 | /* |
|---|
| 192 | + * Pre-commit callback. |
|---|
| 193 | + * |
|---|
| 194 | + * This allows the thin provisioning target to run a callback before |
|---|
| 195 | + * the metadata are committed. |
|---|
| 196 | + */ |
|---|
| 197 | + dm_pool_pre_commit_fn pre_commit_fn; |
|---|
| 198 | + void *pre_commit_context; |
|---|
| 199 | + |
|---|
| 200 | + /* |
|---|
| 192 | 201 | * We reserve a section of the metadata for commit overhead. |
|---|
| 193 | 202 | * All reported space does *not* include this. |
|---|
| 194 | 203 | */ |
|---|
| .. | .. |
|---|
| 200 | 209 | * operation possible in this state is the closing of the device. |
|---|
| 201 | 210 | */ |
|---|
| 202 | 211 | bool fail_io:1; |
|---|
| 212 | + |
|---|
| 213 | + /* |
|---|
| 214 | + * Set once a thin-pool has been accessed through one of the interfaces |
|---|
| 215 | + * that imply the pool is in-service (e.g. thin devices created/deleted, |
|---|
| 216 | + * thin-pool message, metadata snapshots, etc). |
|---|
| 217 | + */ |
|---|
| 218 | + bool in_service:1; |
|---|
| 203 | 219 | |
|---|
| 204 | 220 | /* |
|---|
| 205 | 221 | * Reading the space map roots can fail, so we read it into these |
|---|
| .. | .. |
|---|
| 363 | 379 | memcpy(&v2_le, value2_le, sizeof(v2_le)); |
|---|
| 364 | 380 | |
|---|
| 365 | 381 | return v1_le == v2_le; |
|---|
| 382 | +} |
|---|
| 383 | + |
|---|
| 384 | +/*----------------------------------------------------------------*/ |
|---|
| 385 | + |
|---|
| 386 | +/* |
|---|
| 387 | + * Variant that is used for in-core only changes or code that |
|---|
| 388 | + * shouldn't put the pool in service on its own (e.g. commit). |
|---|
| 389 | + */ |
|---|
| 390 | +static inline void pmd_write_lock_in_core(struct dm_pool_metadata *pmd) |
|---|
| 391 | + __acquires(pmd->root_lock) |
|---|
| 392 | +{ |
|---|
| 393 | + down_write(&pmd->root_lock); |
|---|
| 394 | +} |
|---|
| 395 | + |
|---|
| 396 | +static inline void pmd_write_lock(struct dm_pool_metadata *pmd) |
|---|
| 397 | +{ |
|---|
| 398 | + pmd_write_lock_in_core(pmd); |
|---|
| 399 | + if (unlikely(!pmd->in_service)) |
|---|
| 400 | + pmd->in_service = true; |
|---|
| 401 | +} |
|---|
| 402 | + |
|---|
| 403 | +static inline void pmd_write_unlock(struct dm_pool_metadata *pmd) |
|---|
| 404 | + __releases(pmd->root_lock) |
|---|
| 405 | +{ |
|---|
| 406 | + up_write(&pmd->root_lock); |
|---|
| 366 | 407 | } |
|---|
| 367 | 408 | |
|---|
| 368 | 409 | /*----------------------------------------------------------------*/ |
|---|
| .. | .. |
|---|
| 773 | 814 | return r; |
|---|
| 774 | 815 | |
|---|
| 775 | 816 | if (td->open_count) |
|---|
| 776 | | - td->changed = 0; |
|---|
| 817 | + td->changed = false; |
|---|
| 777 | 818 | else { |
|---|
| 778 | 819 | list_del(&td->list); |
|---|
| 779 | 820 | kfree(td); |
|---|
| .. | .. |
|---|
| 793 | 834 | * We need to know if the thin_disk_superblock exceeds a 512-byte sector. |
|---|
| 794 | 835 | */ |
|---|
| 795 | 836 | BUILD_BUG_ON(sizeof(struct thin_disk_superblock) > 512); |
|---|
| 837 | + BUG_ON(!rwsem_is_locked(&pmd->root_lock)); |
|---|
| 838 | + |
|---|
| 839 | + if (unlikely(!pmd->in_service)) |
|---|
| 840 | + return 0; |
|---|
| 841 | + |
|---|
| 842 | + if (pmd->pre_commit_fn) { |
|---|
| 843 | + r = pmd->pre_commit_fn(pmd->pre_commit_context); |
|---|
| 844 | + if (r < 0) { |
|---|
| 845 | + DMERR("pre-commit callback failed"); |
|---|
| 846 | + return r; |
|---|
| 847 | + } |
|---|
| 848 | + } |
|---|
| 796 | 849 | |
|---|
| 797 | 850 | r = __write_changed_details(pmd); |
|---|
| 798 | 851 | if (r < 0) |
|---|
| .. | .. |
|---|
| 857 | 910 | pmd->time = 0; |
|---|
| 858 | 911 | INIT_LIST_HEAD(&pmd->thin_devices); |
|---|
| 859 | 912 | pmd->fail_io = false; |
|---|
| 913 | + pmd->in_service = false; |
|---|
| 860 | 914 | pmd->bdev = bdev; |
|---|
| 861 | 915 | pmd->data_block_size = data_block_size; |
|---|
| 916 | + pmd->pre_commit_fn = NULL; |
|---|
| 917 | + pmd->pre_commit_context = NULL; |
|---|
| 862 | 918 | |
|---|
| 863 | 919 | r = __create_persistent_data_objects(pmd, format_device); |
|---|
| 864 | 920 | if (r) { |
|---|
| .. | .. |
|---|
| 901 | 957 | return -EBUSY; |
|---|
| 902 | 958 | } |
|---|
| 903 | 959 | |
|---|
| 960 | + pmd_write_lock_in_core(pmd); |
|---|
| 904 | 961 | if (!pmd->fail_io && !dm_bm_is_read_only(pmd->bm)) { |
|---|
| 905 | 962 | r = __commit_transaction(pmd); |
|---|
| 906 | 963 | if (r < 0) |
|---|
| 907 | 964 | DMWARN("%s: __commit_transaction() failed, error = %d", |
|---|
| 908 | 965 | __func__, r); |
|---|
| 909 | 966 | } |
|---|
| 910 | | - |
|---|
| 967 | + pmd_write_unlock(pmd); |
|---|
| 911 | 968 | if (!pmd->fail_io) |
|---|
| 912 | 969 | __destroy_persistent_data_objects(pmd); |
|---|
| 913 | 970 | |
|---|
| .. | .. |
|---|
| 994 | 1051 | int r; |
|---|
| 995 | 1052 | dm_block_t dev_root; |
|---|
| 996 | 1053 | uint64_t key = dev; |
|---|
| 997 | | - struct disk_device_details details_le; |
|---|
| 998 | 1054 | struct dm_thin_device *td; |
|---|
| 999 | 1055 | __le64 value; |
|---|
| 1000 | 1056 | |
|---|
| 1001 | 1057 | r = dm_btree_lookup(&pmd->details_info, pmd->details_root, |
|---|
| 1002 | | - &key, &details_le); |
|---|
| 1058 | + &key, NULL); |
|---|
| 1003 | 1059 | if (!r) |
|---|
| 1004 | 1060 | return -EEXIST; |
|---|
| 1005 | 1061 | |
|---|
| .. | .. |
|---|
| 1036 | 1092 | { |
|---|
| 1037 | 1093 | int r = -EINVAL; |
|---|
| 1038 | 1094 | |
|---|
| 1039 | | - down_write(&pmd->root_lock); |
|---|
| 1095 | + pmd_write_lock(pmd); |
|---|
| 1040 | 1096 | if (!pmd->fail_io) |
|---|
| 1041 | 1097 | r = __create_thin(pmd, dev); |
|---|
| 1042 | | - up_write(&pmd->root_lock); |
|---|
| 1098 | + pmd_write_unlock(pmd); |
|---|
| 1043 | 1099 | |
|---|
| 1044 | 1100 | return r; |
|---|
| 1045 | 1101 | } |
|---|
| .. | .. |
|---|
| 1055 | 1111 | if (r) |
|---|
| 1056 | 1112 | return r; |
|---|
| 1057 | 1113 | |
|---|
| 1058 | | - td->changed = 1; |
|---|
| 1114 | + td->changed = true; |
|---|
| 1059 | 1115 | td->snapshotted_time = time; |
|---|
| 1060 | 1116 | |
|---|
| 1061 | 1117 | snap->mapped_blocks = td->mapped_blocks; |
|---|
| .. | .. |
|---|
| 1072 | 1128 | dm_block_t origin_root; |
|---|
| 1073 | 1129 | uint64_t key = origin, dev_key = dev; |
|---|
| 1074 | 1130 | struct dm_thin_device *td; |
|---|
| 1075 | | - struct disk_device_details details_le; |
|---|
| 1076 | 1131 | __le64 value; |
|---|
| 1077 | 1132 | |
|---|
| 1078 | 1133 | /* check this device is unused */ |
|---|
| 1079 | 1134 | r = dm_btree_lookup(&pmd->details_info, pmd->details_root, |
|---|
| 1080 | | - &dev_key, &details_le); |
|---|
| 1135 | + &dev_key, NULL); |
|---|
| 1081 | 1136 | if (!r) |
|---|
| 1082 | 1137 | return -EEXIST; |
|---|
| 1083 | 1138 | |
|---|
| .. | .. |
|---|
| 1127 | 1182 | { |
|---|
| 1128 | 1183 | int r = -EINVAL; |
|---|
| 1129 | 1184 | |
|---|
| 1130 | | - down_write(&pmd->root_lock); |
|---|
| 1185 | + pmd_write_lock(pmd); |
|---|
| 1131 | 1186 | if (!pmd->fail_io) |
|---|
| 1132 | 1187 | r = __create_snap(pmd, dev, origin); |
|---|
| 1133 | | - up_write(&pmd->root_lock); |
|---|
| 1188 | + pmd_write_unlock(pmd); |
|---|
| 1134 | 1189 | |
|---|
| 1135 | 1190 | return r; |
|---|
| 1136 | 1191 | } |
|---|
| .. | .. |
|---|
| 1170 | 1225 | { |
|---|
| 1171 | 1226 | int r = -EINVAL; |
|---|
| 1172 | 1227 | |
|---|
| 1173 | | - down_write(&pmd->root_lock); |
|---|
| 1228 | + pmd_write_lock(pmd); |
|---|
| 1174 | 1229 | if (!pmd->fail_io) |
|---|
| 1175 | 1230 | r = __delete_device(pmd, dev); |
|---|
| 1176 | | - up_write(&pmd->root_lock); |
|---|
| 1231 | + pmd_write_unlock(pmd); |
|---|
| 1177 | 1232 | |
|---|
| 1178 | 1233 | return r; |
|---|
| 1179 | 1234 | } |
|---|
| .. | .. |
|---|
| 1184 | 1239 | { |
|---|
| 1185 | 1240 | int r = -EINVAL; |
|---|
| 1186 | 1241 | |
|---|
| 1187 | | - down_write(&pmd->root_lock); |
|---|
| 1242 | + pmd_write_lock(pmd); |
|---|
| 1188 | 1243 | |
|---|
| 1189 | 1244 | if (pmd->fail_io) |
|---|
| 1190 | 1245 | goto out; |
|---|
| .. | .. |
|---|
| 1198 | 1253 | r = 0; |
|---|
| 1199 | 1254 | |
|---|
| 1200 | 1255 | out: |
|---|
| 1201 | | - up_write(&pmd->root_lock); |
|---|
| 1256 | + pmd_write_unlock(pmd); |
|---|
| 1202 | 1257 | |
|---|
| 1203 | 1258 | return r; |
|---|
| 1204 | 1259 | } |
|---|
| .. | .. |
|---|
| 1229 | 1284 | * We commit to ensure the btree roots which we increment in a |
|---|
| 1230 | 1285 | * moment are up to date. |
|---|
| 1231 | 1286 | */ |
|---|
| 1232 | | - __commit_transaction(pmd); |
|---|
| 1287 | + r = __commit_transaction(pmd); |
|---|
| 1288 | + if (r < 0) { |
|---|
| 1289 | + DMWARN("%s: __commit_transaction() failed, error = %d", |
|---|
| 1290 | + __func__, r); |
|---|
| 1291 | + return r; |
|---|
| 1292 | + } |
|---|
| 1233 | 1293 | |
|---|
| 1234 | 1294 | /* |
|---|
| 1235 | 1295 | * Copy the superblock. |
|---|
| .. | .. |
|---|
| 1287 | 1347 | { |
|---|
| 1288 | 1348 | int r = -EINVAL; |
|---|
| 1289 | 1349 | |
|---|
| 1290 | | - down_write(&pmd->root_lock); |
|---|
| 1350 | + pmd_write_lock(pmd); |
|---|
| 1291 | 1351 | if (!pmd->fail_io) |
|---|
| 1292 | 1352 | r = __reserve_metadata_snap(pmd); |
|---|
| 1293 | | - up_write(&pmd->root_lock); |
|---|
| 1353 | + pmd_write_unlock(pmd); |
|---|
| 1294 | 1354 | |
|---|
| 1295 | 1355 | return r; |
|---|
| 1296 | 1356 | } |
|---|
| .. | .. |
|---|
| 1335 | 1395 | { |
|---|
| 1336 | 1396 | int r = -EINVAL; |
|---|
| 1337 | 1397 | |
|---|
| 1338 | | - down_write(&pmd->root_lock); |
|---|
| 1398 | + pmd_write_lock(pmd); |
|---|
| 1339 | 1399 | if (!pmd->fail_io) |
|---|
| 1340 | 1400 | r = __release_metadata_snap(pmd); |
|---|
| 1341 | | - up_write(&pmd->root_lock); |
|---|
| 1401 | + pmd_write_unlock(pmd); |
|---|
| 1342 | 1402 | |
|---|
| 1343 | 1403 | return r; |
|---|
| 1344 | 1404 | } |
|---|
| .. | .. |
|---|
| 1381 | 1441 | { |
|---|
| 1382 | 1442 | int r = -EINVAL; |
|---|
| 1383 | 1443 | |
|---|
| 1384 | | - down_write(&pmd->root_lock); |
|---|
| 1444 | + pmd_write_lock_in_core(pmd); |
|---|
| 1385 | 1445 | if (!pmd->fail_io) |
|---|
| 1386 | 1446 | r = __open_device(pmd, dev, 0, td); |
|---|
| 1387 | | - up_write(&pmd->root_lock); |
|---|
| 1447 | + pmd_write_unlock(pmd); |
|---|
| 1388 | 1448 | |
|---|
| 1389 | 1449 | return r; |
|---|
| 1390 | 1450 | } |
|---|
| 1391 | 1451 | |
|---|
| 1392 | 1452 | int dm_pool_close_thin_device(struct dm_thin_device *td) |
|---|
| 1393 | 1453 | { |
|---|
| 1394 | | - down_write(&td->pmd->root_lock); |
|---|
| 1454 | + pmd_write_lock_in_core(td->pmd); |
|---|
| 1395 | 1455 | __close_device(td); |
|---|
| 1396 | | - up_write(&td->pmd->root_lock); |
|---|
| 1456 | + pmd_write_unlock(td->pmd); |
|---|
| 1397 | 1457 | |
|---|
| 1398 | 1458 | return 0; |
|---|
| 1399 | 1459 | } |
|---|
| .. | .. |
|---|
| 1562 | 1622 | if (r) |
|---|
| 1563 | 1623 | return r; |
|---|
| 1564 | 1624 | |
|---|
| 1565 | | - td->changed = 1; |
|---|
| 1625 | + td->changed = true; |
|---|
| 1566 | 1626 | if (inserted) |
|---|
| 1567 | 1627 | td->mapped_blocks++; |
|---|
| 1568 | 1628 | |
|---|
| .. | .. |
|---|
| 1574 | 1634 | { |
|---|
| 1575 | 1635 | int r = -EINVAL; |
|---|
| 1576 | 1636 | |
|---|
| 1577 | | - down_write(&td->pmd->root_lock); |
|---|
| 1637 | + pmd_write_lock(td->pmd); |
|---|
| 1578 | 1638 | if (!td->pmd->fail_io) |
|---|
| 1579 | 1639 | r = __insert(td, block, data_block); |
|---|
| 1580 | | - up_write(&td->pmd->root_lock); |
|---|
| 1640 | + pmd_write_unlock(td->pmd); |
|---|
| 1581 | 1641 | |
|---|
| 1582 | 1642 | return r; |
|---|
| 1583 | 1643 | } |
|---|
| .. | .. |
|---|
| 1593 | 1653 | return r; |
|---|
| 1594 | 1654 | |
|---|
| 1595 | 1655 | td->mapped_blocks--; |
|---|
| 1596 | | - td->changed = 1; |
|---|
| 1656 | + td->changed = true; |
|---|
| 1597 | 1657 | |
|---|
| 1598 | 1658 | return 0; |
|---|
| 1599 | 1659 | } |
|---|
| .. | .. |
|---|
| 1647 | 1707 | } |
|---|
| 1648 | 1708 | |
|---|
| 1649 | 1709 | td->mapped_blocks -= total_count; |
|---|
| 1650 | | - td->changed = 1; |
|---|
| 1710 | + td->changed = true; |
|---|
| 1651 | 1711 | |
|---|
| 1652 | 1712 | /* |
|---|
| 1653 | 1713 | * Reinsert the mapping tree. |
|---|
| .. | .. |
|---|
| 1661 | 1721 | { |
|---|
| 1662 | 1722 | int r = -EINVAL; |
|---|
| 1663 | 1723 | |
|---|
| 1664 | | - down_write(&td->pmd->root_lock); |
|---|
| 1724 | + pmd_write_lock(td->pmd); |
|---|
| 1665 | 1725 | if (!td->pmd->fail_io) |
|---|
| 1666 | 1726 | r = __remove(td, block); |
|---|
| 1667 | | - up_write(&td->pmd->root_lock); |
|---|
| 1727 | + pmd_write_unlock(td->pmd); |
|---|
| 1668 | 1728 | |
|---|
| 1669 | 1729 | return r; |
|---|
| 1670 | 1730 | } |
|---|
| .. | .. |
|---|
| 1674 | 1734 | { |
|---|
| 1675 | 1735 | int r = -EINVAL; |
|---|
| 1676 | 1736 | |
|---|
| 1677 | | - down_write(&td->pmd->root_lock); |
|---|
| 1737 | + pmd_write_lock(td->pmd); |
|---|
| 1678 | 1738 | if (!td->pmd->fail_io) |
|---|
| 1679 | 1739 | r = __remove_range(td, begin, end); |
|---|
| 1680 | | - up_write(&td->pmd->root_lock); |
|---|
| 1740 | + pmd_write_unlock(td->pmd); |
|---|
| 1681 | 1741 | |
|---|
| 1682 | 1742 | return r; |
|---|
| 1683 | 1743 | } |
|---|
| .. | .. |
|---|
| 1700 | 1760 | { |
|---|
| 1701 | 1761 | int r = 0; |
|---|
| 1702 | 1762 | |
|---|
| 1703 | | - down_write(&pmd->root_lock); |
|---|
| 1763 | + pmd_write_lock(pmd); |
|---|
| 1704 | 1764 | for (; b != e; b++) { |
|---|
| 1705 | 1765 | r = dm_sm_inc_block(pmd->data_sm, b); |
|---|
| 1706 | 1766 | if (r) |
|---|
| 1707 | 1767 | break; |
|---|
| 1708 | 1768 | } |
|---|
| 1709 | | - up_write(&pmd->root_lock); |
|---|
| 1769 | + pmd_write_unlock(pmd); |
|---|
| 1710 | 1770 | |
|---|
| 1711 | 1771 | return r; |
|---|
| 1712 | 1772 | } |
|---|
| .. | .. |
|---|
| 1715 | 1775 | { |
|---|
| 1716 | 1776 | int r = 0; |
|---|
| 1717 | 1777 | |
|---|
| 1718 | | - down_write(&pmd->root_lock); |
|---|
| 1778 | + pmd_write_lock(pmd); |
|---|
| 1719 | 1779 | for (; b != e; b++) { |
|---|
| 1720 | 1780 | r = dm_sm_dec_block(pmd->data_sm, b); |
|---|
| 1721 | 1781 | if (r) |
|---|
| 1722 | 1782 | break; |
|---|
| 1723 | 1783 | } |
|---|
| 1724 | | - up_write(&pmd->root_lock); |
|---|
| 1784 | + pmd_write_unlock(pmd); |
|---|
| 1725 | 1785 | |
|---|
| 1726 | 1786 | return r; |
|---|
| 1727 | 1787 | } |
|---|
| .. | .. |
|---|
| 1769 | 1829 | { |
|---|
| 1770 | 1830 | int r = -EINVAL; |
|---|
| 1771 | 1831 | |
|---|
| 1772 | | - down_write(&pmd->root_lock); |
|---|
| 1832 | + pmd_write_lock(pmd); |
|---|
| 1773 | 1833 | if (!pmd->fail_io) |
|---|
| 1774 | 1834 | r = dm_sm_new_block(pmd->data_sm, result); |
|---|
| 1775 | | - up_write(&pmd->root_lock); |
|---|
| 1835 | + pmd_write_unlock(pmd); |
|---|
| 1776 | 1836 | |
|---|
| 1777 | 1837 | return r; |
|---|
| 1778 | 1838 | } |
|---|
| .. | .. |
|---|
| 1781 | 1841 | { |
|---|
| 1782 | 1842 | int r = -EINVAL; |
|---|
| 1783 | 1843 | |
|---|
| 1784 | | - down_write(&pmd->root_lock); |
|---|
| 1844 | + /* |
|---|
| 1845 | + * Care is taken to not have commit be what |
|---|
| 1846 | + * triggers putting the thin-pool in-service. |
|---|
| 1847 | + */ |
|---|
| 1848 | + pmd_write_lock_in_core(pmd); |
|---|
| 1785 | 1849 | if (pmd->fail_io) |
|---|
| 1786 | 1850 | goto out; |
|---|
| 1787 | 1851 | |
|---|
| 1788 | 1852 | r = __commit_transaction(pmd); |
|---|
| 1789 | | - if (r <= 0) |
|---|
| 1853 | + if (r < 0) |
|---|
| 1790 | 1854 | goto out; |
|---|
| 1791 | 1855 | |
|---|
| 1792 | 1856 | /* |
|---|
| .. | .. |
|---|
| 1794 | 1858 | */ |
|---|
| 1795 | 1859 | r = __begin_transaction(pmd); |
|---|
| 1796 | 1860 | out: |
|---|
| 1797 | | - up_write(&pmd->root_lock); |
|---|
| 1861 | + pmd_write_unlock(pmd); |
|---|
| 1798 | 1862 | return r; |
|---|
| 1799 | 1863 | } |
|---|
| 1800 | 1864 | |
|---|
| .. | .. |
|---|
| 1810 | 1874 | { |
|---|
| 1811 | 1875 | int r = -EINVAL; |
|---|
| 1812 | 1876 | |
|---|
| 1813 | | - down_write(&pmd->root_lock); |
|---|
| 1877 | + pmd_write_lock(pmd); |
|---|
| 1814 | 1878 | if (pmd->fail_io) |
|---|
| 1815 | 1879 | goto out; |
|---|
| 1816 | 1880 | |
|---|
| .. | .. |
|---|
| 1821 | 1885 | pmd->fail_io = true; |
|---|
| 1822 | 1886 | |
|---|
| 1823 | 1887 | out: |
|---|
| 1824 | | - up_write(&pmd->root_lock); |
|---|
| 1888 | + pmd_write_unlock(pmd); |
|---|
| 1825 | 1889 | |
|---|
| 1826 | 1890 | return r; |
|---|
| 1827 | 1891 | } |
|---|
| .. | .. |
|---|
| 1952 | 2016 | { |
|---|
| 1953 | 2017 | int r = -EINVAL; |
|---|
| 1954 | 2018 | |
|---|
| 1955 | | - down_write(&pmd->root_lock); |
|---|
| 2019 | + pmd_write_lock(pmd); |
|---|
| 1956 | 2020 | if (!pmd->fail_io) |
|---|
| 1957 | 2021 | r = __resize_space_map(pmd->data_sm, new_count); |
|---|
| 1958 | | - up_write(&pmd->root_lock); |
|---|
| 2022 | + pmd_write_unlock(pmd); |
|---|
| 1959 | 2023 | |
|---|
| 1960 | 2024 | return r; |
|---|
| 1961 | 2025 | } |
|---|
| .. | .. |
|---|
| 1964 | 2028 | { |
|---|
| 1965 | 2029 | int r = -EINVAL; |
|---|
| 1966 | 2030 | |
|---|
| 1967 | | - down_write(&pmd->root_lock); |
|---|
| 2031 | + pmd_write_lock(pmd); |
|---|
| 1968 | 2032 | if (!pmd->fail_io) { |
|---|
| 1969 | 2033 | r = __resize_space_map(pmd->metadata_sm, new_count); |
|---|
| 1970 | 2034 | if (!r) |
|---|
| 1971 | 2035 | __set_metadata_reserve(pmd); |
|---|
| 1972 | 2036 | } |
|---|
| 1973 | | - up_write(&pmd->root_lock); |
|---|
| 2037 | + pmd_write_unlock(pmd); |
|---|
| 1974 | 2038 | |
|---|
| 1975 | 2039 | return r; |
|---|
| 1976 | 2040 | } |
|---|
| 1977 | 2041 | |
|---|
| 1978 | 2042 | void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd) |
|---|
| 1979 | 2043 | { |
|---|
| 1980 | | - down_write(&pmd->root_lock); |
|---|
| 2044 | + pmd_write_lock_in_core(pmd); |
|---|
| 1981 | 2045 | dm_bm_set_read_only(pmd->bm); |
|---|
| 1982 | | - up_write(&pmd->root_lock); |
|---|
| 2046 | + pmd_write_unlock(pmd); |
|---|
| 1983 | 2047 | } |
|---|
| 1984 | 2048 | |
|---|
| 1985 | 2049 | void dm_pool_metadata_read_write(struct dm_pool_metadata *pmd) |
|---|
| 1986 | 2050 | { |
|---|
| 1987 | | - down_write(&pmd->root_lock); |
|---|
| 2051 | + pmd_write_lock_in_core(pmd); |
|---|
| 1988 | 2052 | dm_bm_set_read_write(pmd->bm); |
|---|
| 1989 | | - up_write(&pmd->root_lock); |
|---|
| 2053 | + pmd_write_unlock(pmd); |
|---|
| 1990 | 2054 | } |
|---|
| 1991 | 2055 | |
|---|
| 1992 | 2056 | int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, |
|---|
| .. | .. |
|---|
| 1994 | 2058 | dm_sm_threshold_fn fn, |
|---|
| 1995 | 2059 | void *context) |
|---|
| 1996 | 2060 | { |
|---|
| 1997 | | - int r; |
|---|
| 2061 | + int r = -EINVAL; |
|---|
| 1998 | 2062 | |
|---|
| 1999 | | - down_write(&pmd->root_lock); |
|---|
| 2000 | | - r = dm_sm_register_threshold_callback(pmd->metadata_sm, threshold, fn, context); |
|---|
| 2001 | | - up_write(&pmd->root_lock); |
|---|
| 2063 | + pmd_write_lock_in_core(pmd); |
|---|
| 2064 | + if (!pmd->fail_io) { |
|---|
| 2065 | + r = dm_sm_register_threshold_callback(pmd->metadata_sm, |
|---|
| 2066 | + threshold, fn, context); |
|---|
| 2067 | + } |
|---|
| 2068 | + pmd_write_unlock(pmd); |
|---|
| 2002 | 2069 | |
|---|
| 2003 | 2070 | return r; |
|---|
| 2071 | +} |
|---|
| 2072 | + |
|---|
| 2073 | +void dm_pool_register_pre_commit_callback(struct dm_pool_metadata *pmd, |
|---|
| 2074 | + dm_pool_pre_commit_fn fn, |
|---|
| 2075 | + void *context) |
|---|
| 2076 | +{ |
|---|
| 2077 | + pmd_write_lock_in_core(pmd); |
|---|
| 2078 | + pmd->pre_commit_fn = fn; |
|---|
| 2079 | + pmd->pre_commit_context = context; |
|---|
| 2080 | + pmd_write_unlock(pmd); |
|---|
| 2004 | 2081 | } |
|---|
| 2005 | 2082 | |
|---|
| 2006 | 2083 | int dm_pool_metadata_set_needs_check(struct dm_pool_metadata *pmd) |
|---|
| .. | .. |
|---|
| 2009 | 2086 | struct dm_block *sblock; |
|---|
| 2010 | 2087 | struct thin_disk_superblock *disk_super; |
|---|
| 2011 | 2088 | |
|---|
| 2012 | | - down_write(&pmd->root_lock); |
|---|
| 2089 | + pmd_write_lock(pmd); |
|---|
| 2013 | 2090 | if (pmd->fail_io) |
|---|
| 2014 | 2091 | goto out; |
|---|
| 2015 | 2092 | |
|---|
| .. | .. |
|---|
| 2026 | 2103 | |
|---|
| 2027 | 2104 | dm_bm_unlock(sblock); |
|---|
| 2028 | 2105 | out: |
|---|
| 2029 | | - up_write(&pmd->root_lock); |
|---|
| 2106 | + pmd_write_unlock(pmd); |
|---|
| 2030 | 2107 | return r; |
|---|
| 2031 | 2108 | } |
|---|
| 2032 | 2109 | |
|---|