.. | .. |
---|
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 | /*----------------------------------------------------------------*/ |
---|
.. | .. |
---|
660 | 701 | goto bad_cleanup_data_sm; |
---|
661 | 702 | } |
---|
662 | 703 | |
---|
| 704 | + /* |
---|
| 705 | + * For pool metadata opening process, root setting is redundant |
---|
| 706 | + * because it will be set again in __begin_transaction(). But dm |
---|
| 707 | + * pool aborting process really needs to get last transaction's |
---|
| 708 | + * root to avoid accessing broken btree. |
---|
| 709 | + */ |
---|
| 710 | + pmd->root = le64_to_cpu(disk_super->data_mapping_root); |
---|
| 711 | + pmd->details_root = le64_to_cpu(disk_super->device_details_root); |
---|
| 712 | + |
---|
663 | 713 | __setup_btree_details(pmd); |
---|
664 | 714 | dm_bm_unlock(sblock); |
---|
665 | 715 | |
---|
.. | .. |
---|
712 | 762 | return r; |
---|
713 | 763 | } |
---|
714 | 764 | |
---|
715 | | -static void __destroy_persistent_data_objects(struct dm_pool_metadata *pmd) |
---|
| 765 | +static void __destroy_persistent_data_objects(struct dm_pool_metadata *pmd, |
---|
| 766 | + bool destroy_bm) |
---|
716 | 767 | { |
---|
717 | 768 | dm_sm_destroy(pmd->data_sm); |
---|
718 | 769 | dm_sm_destroy(pmd->metadata_sm); |
---|
719 | 770 | dm_tm_destroy(pmd->nb_tm); |
---|
720 | 771 | dm_tm_destroy(pmd->tm); |
---|
721 | | - dm_block_manager_destroy(pmd->bm); |
---|
| 772 | + if (destroy_bm) |
---|
| 773 | + dm_block_manager_destroy(pmd->bm); |
---|
722 | 774 | } |
---|
723 | 775 | |
---|
724 | 776 | static int __begin_transaction(struct dm_pool_metadata *pmd) |
---|
.. | .. |
---|
773 | 825 | return r; |
---|
774 | 826 | |
---|
775 | 827 | if (td->open_count) |
---|
776 | | - td->changed = 0; |
---|
| 828 | + td->changed = false; |
---|
777 | 829 | else { |
---|
778 | 830 | list_del(&td->list); |
---|
779 | 831 | kfree(td); |
---|
.. | .. |
---|
793 | 845 | * We need to know if the thin_disk_superblock exceeds a 512-byte sector. |
---|
794 | 846 | */ |
---|
795 | 847 | BUILD_BUG_ON(sizeof(struct thin_disk_superblock) > 512); |
---|
| 848 | + BUG_ON(!rwsem_is_locked(&pmd->root_lock)); |
---|
| 849 | + |
---|
| 850 | + if (unlikely(!pmd->in_service)) |
---|
| 851 | + return 0; |
---|
| 852 | + |
---|
| 853 | + if (pmd->pre_commit_fn) { |
---|
| 854 | + r = pmd->pre_commit_fn(pmd->pre_commit_context); |
---|
| 855 | + if (r < 0) { |
---|
| 856 | + DMERR("pre-commit callback failed"); |
---|
| 857 | + return r; |
---|
| 858 | + } |
---|
| 859 | + } |
---|
796 | 860 | |
---|
797 | 861 | r = __write_changed_details(pmd); |
---|
798 | 862 | if (r < 0) |
---|
.. | .. |
---|
857 | 921 | pmd->time = 0; |
---|
858 | 922 | INIT_LIST_HEAD(&pmd->thin_devices); |
---|
859 | 923 | pmd->fail_io = false; |
---|
| 924 | + pmd->in_service = false; |
---|
860 | 925 | pmd->bdev = bdev; |
---|
861 | 926 | pmd->data_block_size = data_block_size; |
---|
| 927 | + pmd->pre_commit_fn = NULL; |
---|
| 928 | + pmd->pre_commit_context = NULL; |
---|
862 | 929 | |
---|
863 | 930 | r = __create_persistent_data_objects(pmd, format_device); |
---|
864 | 931 | if (r) { |
---|
.. | .. |
---|
901 | 968 | return -EBUSY; |
---|
902 | 969 | } |
---|
903 | 970 | |
---|
| 971 | + pmd_write_lock_in_core(pmd); |
---|
904 | 972 | if (!pmd->fail_io && !dm_bm_is_read_only(pmd->bm)) { |
---|
905 | 973 | r = __commit_transaction(pmd); |
---|
906 | 974 | if (r < 0) |
---|
907 | 975 | DMWARN("%s: __commit_transaction() failed, error = %d", |
---|
908 | 976 | __func__, r); |
---|
909 | 977 | } |
---|
910 | | - |
---|
| 978 | + pmd_write_unlock(pmd); |
---|
911 | 979 | if (!pmd->fail_io) |
---|
912 | | - __destroy_persistent_data_objects(pmd); |
---|
| 980 | + __destroy_persistent_data_objects(pmd, true); |
---|
913 | 981 | |
---|
914 | 982 | kfree(pmd); |
---|
915 | 983 | return 0; |
---|
.. | .. |
---|
994 | 1062 | int r; |
---|
995 | 1063 | dm_block_t dev_root; |
---|
996 | 1064 | uint64_t key = dev; |
---|
997 | | - struct disk_device_details details_le; |
---|
998 | 1065 | struct dm_thin_device *td; |
---|
999 | 1066 | __le64 value; |
---|
1000 | 1067 | |
---|
1001 | 1068 | r = dm_btree_lookup(&pmd->details_info, pmd->details_root, |
---|
1002 | | - &key, &details_le); |
---|
| 1069 | + &key, NULL); |
---|
1003 | 1070 | if (!r) |
---|
1004 | 1071 | return -EEXIST; |
---|
1005 | 1072 | |
---|
.. | .. |
---|
1036 | 1103 | { |
---|
1037 | 1104 | int r = -EINVAL; |
---|
1038 | 1105 | |
---|
1039 | | - down_write(&pmd->root_lock); |
---|
| 1106 | + pmd_write_lock(pmd); |
---|
1040 | 1107 | if (!pmd->fail_io) |
---|
1041 | 1108 | r = __create_thin(pmd, dev); |
---|
1042 | | - up_write(&pmd->root_lock); |
---|
| 1109 | + pmd_write_unlock(pmd); |
---|
1043 | 1110 | |
---|
1044 | 1111 | return r; |
---|
1045 | 1112 | } |
---|
.. | .. |
---|
1055 | 1122 | if (r) |
---|
1056 | 1123 | return r; |
---|
1057 | 1124 | |
---|
1058 | | - td->changed = 1; |
---|
| 1125 | + td->changed = true; |
---|
1059 | 1126 | td->snapshotted_time = time; |
---|
1060 | 1127 | |
---|
1061 | 1128 | snap->mapped_blocks = td->mapped_blocks; |
---|
.. | .. |
---|
1072 | 1139 | dm_block_t origin_root; |
---|
1073 | 1140 | uint64_t key = origin, dev_key = dev; |
---|
1074 | 1141 | struct dm_thin_device *td; |
---|
1075 | | - struct disk_device_details details_le; |
---|
1076 | 1142 | __le64 value; |
---|
1077 | 1143 | |
---|
1078 | 1144 | /* check this device is unused */ |
---|
1079 | 1145 | r = dm_btree_lookup(&pmd->details_info, pmd->details_root, |
---|
1080 | | - &dev_key, &details_le); |
---|
| 1146 | + &dev_key, NULL); |
---|
1081 | 1147 | if (!r) |
---|
1082 | 1148 | return -EEXIST; |
---|
1083 | 1149 | |
---|
.. | .. |
---|
1127 | 1193 | { |
---|
1128 | 1194 | int r = -EINVAL; |
---|
1129 | 1195 | |
---|
1130 | | - down_write(&pmd->root_lock); |
---|
| 1196 | + pmd_write_lock(pmd); |
---|
1131 | 1197 | if (!pmd->fail_io) |
---|
1132 | 1198 | r = __create_snap(pmd, dev, origin); |
---|
1133 | | - up_write(&pmd->root_lock); |
---|
| 1199 | + pmd_write_unlock(pmd); |
---|
1134 | 1200 | |
---|
1135 | 1201 | return r; |
---|
1136 | 1202 | } |
---|
.. | .. |
---|
1170 | 1236 | { |
---|
1171 | 1237 | int r = -EINVAL; |
---|
1172 | 1238 | |
---|
1173 | | - down_write(&pmd->root_lock); |
---|
| 1239 | + pmd_write_lock(pmd); |
---|
1174 | 1240 | if (!pmd->fail_io) |
---|
1175 | 1241 | r = __delete_device(pmd, dev); |
---|
1176 | | - up_write(&pmd->root_lock); |
---|
| 1242 | + pmd_write_unlock(pmd); |
---|
1177 | 1243 | |
---|
1178 | 1244 | return r; |
---|
1179 | 1245 | } |
---|
.. | .. |
---|
1184 | 1250 | { |
---|
1185 | 1251 | int r = -EINVAL; |
---|
1186 | 1252 | |
---|
1187 | | - down_write(&pmd->root_lock); |
---|
| 1253 | + pmd_write_lock(pmd); |
---|
1188 | 1254 | |
---|
1189 | 1255 | if (pmd->fail_io) |
---|
1190 | 1256 | goto out; |
---|
.. | .. |
---|
1198 | 1264 | r = 0; |
---|
1199 | 1265 | |
---|
1200 | 1266 | out: |
---|
1201 | | - up_write(&pmd->root_lock); |
---|
| 1267 | + pmd_write_unlock(pmd); |
---|
1202 | 1268 | |
---|
1203 | 1269 | return r; |
---|
1204 | 1270 | } |
---|
.. | .. |
---|
1229 | 1295 | * We commit to ensure the btree roots which we increment in a |
---|
1230 | 1296 | * moment are up to date. |
---|
1231 | 1297 | */ |
---|
1232 | | - __commit_transaction(pmd); |
---|
| 1298 | + r = __commit_transaction(pmd); |
---|
| 1299 | + if (r < 0) { |
---|
| 1300 | + DMWARN("%s: __commit_transaction() failed, error = %d", |
---|
| 1301 | + __func__, r); |
---|
| 1302 | + return r; |
---|
| 1303 | + } |
---|
1233 | 1304 | |
---|
1234 | 1305 | /* |
---|
1235 | 1306 | * Copy the superblock. |
---|
.. | .. |
---|
1287 | 1358 | { |
---|
1288 | 1359 | int r = -EINVAL; |
---|
1289 | 1360 | |
---|
1290 | | - down_write(&pmd->root_lock); |
---|
| 1361 | + pmd_write_lock(pmd); |
---|
1291 | 1362 | if (!pmd->fail_io) |
---|
1292 | 1363 | r = __reserve_metadata_snap(pmd); |
---|
1293 | | - up_write(&pmd->root_lock); |
---|
| 1364 | + pmd_write_unlock(pmd); |
---|
1294 | 1365 | |
---|
1295 | 1366 | return r; |
---|
1296 | 1367 | } |
---|
.. | .. |
---|
1335 | 1406 | { |
---|
1336 | 1407 | int r = -EINVAL; |
---|
1337 | 1408 | |
---|
1338 | | - down_write(&pmd->root_lock); |
---|
| 1409 | + pmd_write_lock(pmd); |
---|
1339 | 1410 | if (!pmd->fail_io) |
---|
1340 | 1411 | r = __release_metadata_snap(pmd); |
---|
1341 | | - up_write(&pmd->root_lock); |
---|
| 1412 | + pmd_write_unlock(pmd); |
---|
1342 | 1413 | |
---|
1343 | 1414 | return r; |
---|
1344 | 1415 | } |
---|
.. | .. |
---|
1381 | 1452 | { |
---|
1382 | 1453 | int r = -EINVAL; |
---|
1383 | 1454 | |
---|
1384 | | - down_write(&pmd->root_lock); |
---|
| 1455 | + pmd_write_lock_in_core(pmd); |
---|
1385 | 1456 | if (!pmd->fail_io) |
---|
1386 | 1457 | r = __open_device(pmd, dev, 0, td); |
---|
1387 | | - up_write(&pmd->root_lock); |
---|
| 1458 | + pmd_write_unlock(pmd); |
---|
1388 | 1459 | |
---|
1389 | 1460 | return r; |
---|
1390 | 1461 | } |
---|
1391 | 1462 | |
---|
1392 | 1463 | int dm_pool_close_thin_device(struct dm_thin_device *td) |
---|
1393 | 1464 | { |
---|
1394 | | - down_write(&td->pmd->root_lock); |
---|
| 1465 | + pmd_write_lock_in_core(td->pmd); |
---|
1395 | 1466 | __close_device(td); |
---|
1396 | | - up_write(&td->pmd->root_lock); |
---|
| 1467 | + pmd_write_unlock(td->pmd); |
---|
1397 | 1468 | |
---|
1398 | 1469 | return 0; |
---|
1399 | 1470 | } |
---|
.. | .. |
---|
1562 | 1633 | if (r) |
---|
1563 | 1634 | return r; |
---|
1564 | 1635 | |
---|
1565 | | - td->changed = 1; |
---|
| 1636 | + td->changed = true; |
---|
1566 | 1637 | if (inserted) |
---|
1567 | 1638 | td->mapped_blocks++; |
---|
1568 | 1639 | |
---|
.. | .. |
---|
1574 | 1645 | { |
---|
1575 | 1646 | int r = -EINVAL; |
---|
1576 | 1647 | |
---|
1577 | | - down_write(&td->pmd->root_lock); |
---|
| 1648 | + pmd_write_lock(td->pmd); |
---|
1578 | 1649 | if (!td->pmd->fail_io) |
---|
1579 | 1650 | r = __insert(td, block, data_block); |
---|
1580 | | - up_write(&td->pmd->root_lock); |
---|
| 1651 | + pmd_write_unlock(td->pmd); |
---|
1581 | 1652 | |
---|
1582 | 1653 | return r; |
---|
1583 | 1654 | } |
---|
.. | .. |
---|
1593 | 1664 | return r; |
---|
1594 | 1665 | |
---|
1595 | 1666 | td->mapped_blocks--; |
---|
1596 | | - td->changed = 1; |
---|
| 1667 | + td->changed = true; |
---|
1597 | 1668 | |
---|
1598 | 1669 | return 0; |
---|
1599 | 1670 | } |
---|
.. | .. |
---|
1647 | 1718 | } |
---|
1648 | 1719 | |
---|
1649 | 1720 | td->mapped_blocks -= total_count; |
---|
1650 | | - td->changed = 1; |
---|
| 1721 | + td->changed = true; |
---|
1651 | 1722 | |
---|
1652 | 1723 | /* |
---|
1653 | 1724 | * Reinsert the mapping tree. |
---|
.. | .. |
---|
1661 | 1732 | { |
---|
1662 | 1733 | int r = -EINVAL; |
---|
1663 | 1734 | |
---|
1664 | | - down_write(&td->pmd->root_lock); |
---|
| 1735 | + pmd_write_lock(td->pmd); |
---|
1665 | 1736 | if (!td->pmd->fail_io) |
---|
1666 | 1737 | r = __remove(td, block); |
---|
1667 | | - up_write(&td->pmd->root_lock); |
---|
| 1738 | + pmd_write_unlock(td->pmd); |
---|
1668 | 1739 | |
---|
1669 | 1740 | return r; |
---|
1670 | 1741 | } |
---|
.. | .. |
---|
1674 | 1745 | { |
---|
1675 | 1746 | int r = -EINVAL; |
---|
1676 | 1747 | |
---|
1677 | | - down_write(&td->pmd->root_lock); |
---|
| 1748 | + pmd_write_lock(td->pmd); |
---|
1678 | 1749 | if (!td->pmd->fail_io) |
---|
1679 | 1750 | r = __remove_range(td, begin, end); |
---|
1680 | | - up_write(&td->pmd->root_lock); |
---|
| 1751 | + pmd_write_unlock(td->pmd); |
---|
1681 | 1752 | |
---|
1682 | 1753 | return r; |
---|
1683 | 1754 | } |
---|
.. | .. |
---|
1700 | 1771 | { |
---|
1701 | 1772 | int r = 0; |
---|
1702 | 1773 | |
---|
1703 | | - down_write(&pmd->root_lock); |
---|
| 1774 | + pmd_write_lock(pmd); |
---|
1704 | 1775 | for (; b != e; b++) { |
---|
1705 | 1776 | r = dm_sm_inc_block(pmd->data_sm, b); |
---|
1706 | 1777 | if (r) |
---|
1707 | 1778 | break; |
---|
1708 | 1779 | } |
---|
1709 | | - up_write(&pmd->root_lock); |
---|
| 1780 | + pmd_write_unlock(pmd); |
---|
1710 | 1781 | |
---|
1711 | 1782 | return r; |
---|
1712 | 1783 | } |
---|
.. | .. |
---|
1715 | 1786 | { |
---|
1716 | 1787 | int r = 0; |
---|
1717 | 1788 | |
---|
1718 | | - down_write(&pmd->root_lock); |
---|
| 1789 | + pmd_write_lock(pmd); |
---|
1719 | 1790 | for (; b != e; b++) { |
---|
1720 | 1791 | r = dm_sm_dec_block(pmd->data_sm, b); |
---|
1721 | 1792 | if (r) |
---|
1722 | 1793 | break; |
---|
1723 | 1794 | } |
---|
1724 | | - up_write(&pmd->root_lock); |
---|
| 1795 | + pmd_write_unlock(pmd); |
---|
1725 | 1796 | |
---|
1726 | 1797 | return r; |
---|
1727 | 1798 | } |
---|
.. | .. |
---|
1769 | 1840 | { |
---|
1770 | 1841 | int r = -EINVAL; |
---|
1771 | 1842 | |
---|
1772 | | - down_write(&pmd->root_lock); |
---|
| 1843 | + pmd_write_lock(pmd); |
---|
1773 | 1844 | if (!pmd->fail_io) |
---|
1774 | 1845 | r = dm_sm_new_block(pmd->data_sm, result); |
---|
1775 | | - up_write(&pmd->root_lock); |
---|
| 1846 | + pmd_write_unlock(pmd); |
---|
1776 | 1847 | |
---|
1777 | 1848 | return r; |
---|
1778 | 1849 | } |
---|
.. | .. |
---|
1781 | 1852 | { |
---|
1782 | 1853 | int r = -EINVAL; |
---|
1783 | 1854 | |
---|
1784 | | - down_write(&pmd->root_lock); |
---|
| 1855 | + /* |
---|
| 1856 | + * Care is taken to not have commit be what |
---|
| 1857 | + * triggers putting the thin-pool in-service. |
---|
| 1858 | + */ |
---|
| 1859 | + pmd_write_lock_in_core(pmd); |
---|
1785 | 1860 | if (pmd->fail_io) |
---|
1786 | 1861 | goto out; |
---|
1787 | 1862 | |
---|
1788 | 1863 | r = __commit_transaction(pmd); |
---|
1789 | | - if (r <= 0) |
---|
| 1864 | + if (r < 0) |
---|
1790 | 1865 | goto out; |
---|
1791 | 1866 | |
---|
1792 | 1867 | /* |
---|
.. | .. |
---|
1794 | 1869 | */ |
---|
1795 | 1870 | r = __begin_transaction(pmd); |
---|
1796 | 1871 | out: |
---|
1797 | | - up_write(&pmd->root_lock); |
---|
| 1872 | + pmd_write_unlock(pmd); |
---|
1798 | 1873 | return r; |
---|
1799 | 1874 | } |
---|
1800 | 1875 | |
---|
.. | .. |
---|
1809 | 1884 | int dm_pool_abort_metadata(struct dm_pool_metadata *pmd) |
---|
1810 | 1885 | { |
---|
1811 | 1886 | int r = -EINVAL; |
---|
| 1887 | + struct dm_block_manager *old_bm = NULL, *new_bm = NULL; |
---|
1812 | 1888 | |
---|
1813 | | - down_write(&pmd->root_lock); |
---|
1814 | | - if (pmd->fail_io) |
---|
| 1889 | + /* fail_io is double-checked with pmd->root_lock held below */ |
---|
| 1890 | + if (unlikely(pmd->fail_io)) |
---|
| 1891 | + return r; |
---|
| 1892 | + |
---|
| 1893 | + /* |
---|
| 1894 | + * Replacement block manager (new_bm) is created and old_bm destroyed outside of |
---|
| 1895 | + * pmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of |
---|
| 1896 | + * shrinker associated with the block manager's bufio client vs pmd root_lock). |
---|
| 1897 | + * - must take shrinker_rwsem without holding pmd->root_lock |
---|
| 1898 | + */ |
---|
| 1899 | + new_bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT, |
---|
| 1900 | + THIN_MAX_CONCURRENT_LOCKS); |
---|
| 1901 | + |
---|
| 1902 | + pmd_write_lock(pmd); |
---|
| 1903 | + if (pmd->fail_io) { |
---|
| 1904 | + pmd_write_unlock(pmd); |
---|
1815 | 1905 | goto out; |
---|
| 1906 | + } |
---|
1816 | 1907 | |
---|
1817 | 1908 | __set_abort_with_changes_flags(pmd); |
---|
1818 | | - __destroy_persistent_data_objects(pmd); |
---|
1819 | | - r = __create_persistent_data_objects(pmd, false); |
---|
| 1909 | + __destroy_persistent_data_objects(pmd, false); |
---|
| 1910 | + old_bm = pmd->bm; |
---|
| 1911 | + if (IS_ERR(new_bm)) { |
---|
| 1912 | + DMERR("could not create block manager during abort"); |
---|
| 1913 | + pmd->bm = NULL; |
---|
| 1914 | + r = PTR_ERR(new_bm); |
---|
| 1915 | + goto out_unlock; |
---|
| 1916 | + } |
---|
| 1917 | + |
---|
| 1918 | + pmd->bm = new_bm; |
---|
| 1919 | + r = __open_or_format_metadata(pmd, false); |
---|
| 1920 | + if (r) { |
---|
| 1921 | + pmd->bm = NULL; |
---|
| 1922 | + goto out_unlock; |
---|
| 1923 | + } |
---|
| 1924 | + new_bm = NULL; |
---|
| 1925 | +out_unlock: |
---|
1820 | 1926 | if (r) |
---|
1821 | 1927 | pmd->fail_io = true; |
---|
1822 | | - |
---|
| 1928 | + pmd_write_unlock(pmd); |
---|
| 1929 | + dm_block_manager_destroy(old_bm); |
---|
1823 | 1930 | out: |
---|
1824 | | - up_write(&pmd->root_lock); |
---|
| 1931 | + if (new_bm && !IS_ERR(new_bm)) |
---|
| 1932 | + dm_block_manager_destroy(new_bm); |
---|
1825 | 1933 | |
---|
1826 | 1934 | return r; |
---|
1827 | 1935 | } |
---|
.. | .. |
---|
1952 | 2060 | { |
---|
1953 | 2061 | int r = -EINVAL; |
---|
1954 | 2062 | |
---|
1955 | | - down_write(&pmd->root_lock); |
---|
| 2063 | + pmd_write_lock(pmd); |
---|
1956 | 2064 | if (!pmd->fail_io) |
---|
1957 | 2065 | r = __resize_space_map(pmd->data_sm, new_count); |
---|
1958 | | - up_write(&pmd->root_lock); |
---|
| 2066 | + pmd_write_unlock(pmd); |
---|
1959 | 2067 | |
---|
1960 | 2068 | return r; |
---|
1961 | 2069 | } |
---|
.. | .. |
---|
1964 | 2072 | { |
---|
1965 | 2073 | int r = -EINVAL; |
---|
1966 | 2074 | |
---|
1967 | | - down_write(&pmd->root_lock); |
---|
| 2075 | + pmd_write_lock(pmd); |
---|
1968 | 2076 | if (!pmd->fail_io) { |
---|
1969 | 2077 | r = __resize_space_map(pmd->metadata_sm, new_count); |
---|
1970 | 2078 | if (!r) |
---|
1971 | 2079 | __set_metadata_reserve(pmd); |
---|
1972 | 2080 | } |
---|
1973 | | - up_write(&pmd->root_lock); |
---|
| 2081 | + pmd_write_unlock(pmd); |
---|
1974 | 2082 | |
---|
1975 | 2083 | return r; |
---|
1976 | 2084 | } |
---|
1977 | 2085 | |
---|
1978 | 2086 | void dm_pool_metadata_read_only(struct dm_pool_metadata *pmd) |
---|
1979 | 2087 | { |
---|
1980 | | - down_write(&pmd->root_lock); |
---|
| 2088 | + pmd_write_lock_in_core(pmd); |
---|
1981 | 2089 | dm_bm_set_read_only(pmd->bm); |
---|
1982 | | - up_write(&pmd->root_lock); |
---|
| 2090 | + pmd_write_unlock(pmd); |
---|
1983 | 2091 | } |
---|
1984 | 2092 | |
---|
1985 | 2093 | void dm_pool_metadata_read_write(struct dm_pool_metadata *pmd) |
---|
1986 | 2094 | { |
---|
1987 | | - down_write(&pmd->root_lock); |
---|
| 2095 | + pmd_write_lock_in_core(pmd); |
---|
1988 | 2096 | dm_bm_set_read_write(pmd->bm); |
---|
1989 | | - up_write(&pmd->root_lock); |
---|
| 2097 | + pmd_write_unlock(pmd); |
---|
1990 | 2098 | } |
---|
1991 | 2099 | |
---|
1992 | 2100 | int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, |
---|
.. | .. |
---|
1994 | 2102 | dm_sm_threshold_fn fn, |
---|
1995 | 2103 | void *context) |
---|
1996 | 2104 | { |
---|
1997 | | - int r; |
---|
| 2105 | + int r = -EINVAL; |
---|
1998 | 2106 | |
---|
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); |
---|
| 2107 | + pmd_write_lock_in_core(pmd); |
---|
| 2108 | + if (!pmd->fail_io) { |
---|
| 2109 | + r = dm_sm_register_threshold_callback(pmd->metadata_sm, |
---|
| 2110 | + threshold, fn, context); |
---|
| 2111 | + } |
---|
| 2112 | + pmd_write_unlock(pmd); |
---|
2002 | 2113 | |
---|
2003 | 2114 | return r; |
---|
| 2115 | +} |
---|
| 2116 | + |
---|
| 2117 | +void dm_pool_register_pre_commit_callback(struct dm_pool_metadata *pmd, |
---|
| 2118 | + dm_pool_pre_commit_fn fn, |
---|
| 2119 | + void *context) |
---|
| 2120 | +{ |
---|
| 2121 | + pmd_write_lock_in_core(pmd); |
---|
| 2122 | + pmd->pre_commit_fn = fn; |
---|
| 2123 | + pmd->pre_commit_context = context; |
---|
| 2124 | + pmd_write_unlock(pmd); |
---|
2004 | 2125 | } |
---|
2005 | 2126 | |
---|
2006 | 2127 | int dm_pool_metadata_set_needs_check(struct dm_pool_metadata *pmd) |
---|
.. | .. |
---|
2009 | 2130 | struct dm_block *sblock; |
---|
2010 | 2131 | struct thin_disk_superblock *disk_super; |
---|
2011 | 2132 | |
---|
2012 | | - down_write(&pmd->root_lock); |
---|
| 2133 | + pmd_write_lock(pmd); |
---|
2013 | 2134 | if (pmd->fail_io) |
---|
2014 | 2135 | goto out; |
---|
2015 | 2136 | |
---|
.. | .. |
---|
2026 | 2147 | |
---|
2027 | 2148 | dm_bm_unlock(sblock); |
---|
2028 | 2149 | out: |
---|
2029 | | - up_write(&pmd->root_lock); |
---|
| 2150 | + pmd_write_unlock(pmd); |
---|
2030 | 2151 | return r; |
---|
2031 | 2152 | } |
---|
2032 | 2153 | |
---|