.. | .. |
---|
33 | 33 | key.type = BTRFS_EXTENT_DATA_KEY; |
---|
34 | 34 | key.offset = start; |
---|
35 | 35 | |
---|
36 | | - setup_items_for_insert(root, &path, &key, &value_len, value_len, |
---|
37 | | - value_len + sizeof(struct btrfs_item), 1); |
---|
| 36 | + setup_items_for_insert(root, &path, &key, &value_len, 1); |
---|
38 | 37 | fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); |
---|
39 | 38 | btrfs_set_file_extent_generation(leaf, fi, 1); |
---|
40 | 39 | btrfs_set_file_extent_type(leaf, fi, type); |
---|
.. | .. |
---|
64 | 63 | key.type = BTRFS_INODE_ITEM_KEY; |
---|
65 | 64 | key.offset = 0; |
---|
66 | 65 | |
---|
67 | | - setup_items_for_insert(root, &path, &key, &value_len, value_len, |
---|
68 | | - value_len + sizeof(struct btrfs_item), 1); |
---|
| 66 | + setup_items_for_insert(root, &path, &key, &value_len, 1); |
---|
69 | 67 | } |
---|
70 | 68 | |
---|
71 | 69 | /* |
---|
.. | .. |
---|
226 | 224 | u64 offset; |
---|
227 | 225 | int ret = -ENOMEM; |
---|
228 | 226 | |
---|
| 227 | + test_msg("running btrfs_get_extent tests"); |
---|
| 228 | + |
---|
229 | 229 | inode = btrfs_new_test_inode(); |
---|
230 | 230 | if (!inode) { |
---|
231 | | - test_err("couldn't allocate inode"); |
---|
| 231 | + test_std_err(TEST_ALLOC_INODE); |
---|
232 | 232 | return ret; |
---|
233 | 233 | } |
---|
234 | 234 | |
---|
.. | .. |
---|
239 | 239 | |
---|
240 | 240 | fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize); |
---|
241 | 241 | if (!fs_info) { |
---|
242 | | - test_err("couldn't allocate dummy fs info"); |
---|
| 242 | + test_std_err(TEST_ALLOC_FS_INFO); |
---|
243 | 243 | goto out; |
---|
244 | 244 | } |
---|
245 | 245 | |
---|
246 | 246 | root = btrfs_alloc_dummy_root(fs_info); |
---|
247 | 247 | if (IS_ERR(root)) { |
---|
248 | | - test_err("couldn't allocate root"); |
---|
| 248 | + test_std_err(TEST_ALLOC_ROOT); |
---|
249 | 249 | goto out; |
---|
250 | 250 | } |
---|
251 | 251 | |
---|
252 | 252 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); |
---|
253 | 253 | if (!root->node) { |
---|
254 | | - test_err("couldn't allocate dummy buffer"); |
---|
| 254 | + test_std_err(TEST_ALLOC_ROOT); |
---|
255 | 255 | goto out; |
---|
256 | 256 | } |
---|
257 | 257 | |
---|
258 | | - /* |
---|
259 | | - * We will just free a dummy node if it's ref count is 2 so we need an |
---|
260 | | - * extra ref so our searches don't accidentally release our page. |
---|
261 | | - */ |
---|
262 | | - extent_buffer_get(root->node); |
---|
263 | 258 | btrfs_set_header_nritems(root->node, 0); |
---|
264 | 259 | btrfs_set_header_level(root->node, 0); |
---|
265 | 260 | ret = -EINVAL; |
---|
266 | 261 | |
---|
267 | 262 | /* First with no extents */ |
---|
268 | 263 | BTRFS_I(inode)->root = root; |
---|
269 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize, 0); |
---|
| 264 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, sectorsize); |
---|
270 | 265 | if (IS_ERR(em)) { |
---|
271 | 266 | em = NULL; |
---|
272 | 267 | test_err("got an error when we shouldn't have"); |
---|
.. | .. |
---|
286 | 281 | */ |
---|
287 | 282 | setup_file_extents(root, sectorsize); |
---|
288 | 283 | |
---|
289 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1, 0); |
---|
| 284 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, (u64)-1); |
---|
290 | 285 | if (IS_ERR(em)) { |
---|
291 | 286 | test_err("got an error when we shouldn't have"); |
---|
292 | 287 | goto out; |
---|
.. | .. |
---|
308 | 303 | offset = em->start + em->len; |
---|
309 | 304 | free_extent_map(em); |
---|
310 | 305 | |
---|
311 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 306 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
312 | 307 | if (IS_ERR(em)) { |
---|
313 | 308 | test_err("got an error when we shouldn't have"); |
---|
314 | 309 | goto out; |
---|
.. | .. |
---|
336 | 331 | offset = em->start + em->len; |
---|
337 | 332 | free_extent_map(em); |
---|
338 | 333 | |
---|
339 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 334 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
340 | 335 | if (IS_ERR(em)) { |
---|
341 | 336 | test_err("got an error when we shouldn't have"); |
---|
342 | 337 | goto out; |
---|
.. | .. |
---|
359 | 354 | free_extent_map(em); |
---|
360 | 355 | |
---|
361 | 356 | /* Regular extent */ |
---|
362 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 357 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
363 | 358 | if (IS_ERR(em)) { |
---|
364 | 359 | test_err("got an error when we shouldn't have"); |
---|
365 | 360 | goto out; |
---|
.. | .. |
---|
387 | 382 | free_extent_map(em); |
---|
388 | 383 | |
---|
389 | 384 | /* The next 3 are split extents */ |
---|
390 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 385 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
391 | 386 | if (IS_ERR(em)) { |
---|
392 | 387 | test_err("got an error when we shouldn't have"); |
---|
393 | 388 | goto out; |
---|
.. | .. |
---|
416 | 411 | offset = em->start + em->len; |
---|
417 | 412 | free_extent_map(em); |
---|
418 | 413 | |
---|
419 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 414 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
420 | 415 | if (IS_ERR(em)) { |
---|
421 | 416 | test_err("got an error when we shouldn't have"); |
---|
422 | 417 | goto out; |
---|
.. | .. |
---|
438 | 433 | offset = em->start + em->len; |
---|
439 | 434 | free_extent_map(em); |
---|
440 | 435 | |
---|
441 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 436 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
442 | 437 | if (IS_ERR(em)) { |
---|
443 | 438 | test_err("got an error when we shouldn't have"); |
---|
444 | 439 | goto out; |
---|
.. | .. |
---|
472 | 467 | free_extent_map(em); |
---|
473 | 468 | |
---|
474 | 469 | /* Prealloc extent */ |
---|
475 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 470 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
476 | 471 | if (IS_ERR(em)) { |
---|
477 | 472 | test_err("got an error when we shouldn't have"); |
---|
478 | 473 | goto out; |
---|
.. | .. |
---|
501 | 496 | free_extent_map(em); |
---|
502 | 497 | |
---|
503 | 498 | /* The next 3 are a half written prealloc extent */ |
---|
504 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 499 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
505 | 500 | if (IS_ERR(em)) { |
---|
506 | 501 | test_err("got an error when we shouldn't have"); |
---|
507 | 502 | goto out; |
---|
.. | .. |
---|
531 | 526 | offset = em->start + em->len; |
---|
532 | 527 | free_extent_map(em); |
---|
533 | 528 | |
---|
534 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 529 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
535 | 530 | if (IS_ERR(em)) { |
---|
536 | 531 | test_err("got an error when we shouldn't have"); |
---|
537 | 532 | goto out; |
---|
.. | .. |
---|
564 | 559 | offset = em->start + em->len; |
---|
565 | 560 | free_extent_map(em); |
---|
566 | 561 | |
---|
567 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 562 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
568 | 563 | if (IS_ERR(em)) { |
---|
569 | 564 | test_err("got an error when we shouldn't have"); |
---|
570 | 565 | goto out; |
---|
.. | .. |
---|
599 | 594 | free_extent_map(em); |
---|
600 | 595 | |
---|
601 | 596 | /* Now for the compressed extent */ |
---|
602 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 597 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
603 | 598 | if (IS_ERR(em)) { |
---|
604 | 599 | test_err("got an error when we shouldn't have"); |
---|
605 | 600 | goto out; |
---|
.. | .. |
---|
633 | 628 | free_extent_map(em); |
---|
634 | 629 | |
---|
635 | 630 | /* Split compressed extent */ |
---|
636 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 631 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
637 | 632 | if (IS_ERR(em)) { |
---|
638 | 633 | test_err("got an error when we shouldn't have"); |
---|
639 | 634 | goto out; |
---|
.. | .. |
---|
668 | 663 | offset = em->start + em->len; |
---|
669 | 664 | free_extent_map(em); |
---|
670 | 665 | |
---|
671 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 666 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
672 | 667 | if (IS_ERR(em)) { |
---|
673 | 668 | test_err("got an error when we shouldn't have"); |
---|
674 | 669 | goto out; |
---|
.. | .. |
---|
695 | 690 | offset = em->start + em->len; |
---|
696 | 691 | free_extent_map(em); |
---|
697 | 692 | |
---|
698 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 693 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
699 | 694 | if (IS_ERR(em)) { |
---|
700 | 695 | test_err("got an error when we shouldn't have"); |
---|
701 | 696 | goto out; |
---|
.. | .. |
---|
730 | 725 | free_extent_map(em); |
---|
731 | 726 | |
---|
732 | 727 | /* A hole between regular extents but no hole extent */ |
---|
733 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6, |
---|
734 | | - sectorsize, 0); |
---|
| 728 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset + 6, sectorsize); |
---|
735 | 729 | if (IS_ERR(em)) { |
---|
736 | 730 | test_err("got an error when we shouldn't have"); |
---|
737 | 731 | goto out; |
---|
.. | .. |
---|
758 | 752 | offset = em->start + em->len; |
---|
759 | 753 | free_extent_map(em); |
---|
760 | 754 | |
---|
761 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, SZ_4M, 0); |
---|
| 755 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, SZ_4M); |
---|
762 | 756 | if (IS_ERR(em)) { |
---|
763 | 757 | test_err("got an error when we shouldn't have"); |
---|
764 | 758 | goto out; |
---|
.. | .. |
---|
791 | 785 | offset = em->start + em->len; |
---|
792 | 786 | free_extent_map(em); |
---|
793 | 787 | |
---|
794 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize, 0); |
---|
| 788 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, offset, sectorsize); |
---|
795 | 789 | if (IS_ERR(em)) { |
---|
796 | 790 | test_err("got an error when we shouldn't have"); |
---|
797 | 791 | goto out; |
---|
.. | .. |
---|
833 | 827 | struct extent_map *em = NULL; |
---|
834 | 828 | int ret = -ENOMEM; |
---|
835 | 829 | |
---|
| 830 | + test_msg("running hole first btrfs_get_extent test"); |
---|
| 831 | + |
---|
836 | 832 | inode = btrfs_new_test_inode(); |
---|
837 | 833 | if (!inode) { |
---|
838 | | - test_err("couldn't allocate inode"); |
---|
| 834 | + test_std_err(TEST_ALLOC_INODE); |
---|
839 | 835 | return ret; |
---|
840 | 836 | } |
---|
841 | 837 | |
---|
.. | .. |
---|
845 | 841 | |
---|
846 | 842 | fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize); |
---|
847 | 843 | if (!fs_info) { |
---|
848 | | - test_err("couldn't allocate dummy fs info"); |
---|
| 844 | + test_std_err(TEST_ALLOC_FS_INFO); |
---|
849 | 845 | goto out; |
---|
850 | 846 | } |
---|
851 | 847 | |
---|
852 | 848 | root = btrfs_alloc_dummy_root(fs_info); |
---|
853 | 849 | if (IS_ERR(root)) { |
---|
854 | | - test_err("couldn't allocate root"); |
---|
| 850 | + test_std_err(TEST_ALLOC_ROOT); |
---|
855 | 851 | goto out; |
---|
856 | 852 | } |
---|
857 | 853 | |
---|
858 | 854 | root->node = alloc_dummy_extent_buffer(fs_info, nodesize); |
---|
859 | 855 | if (!root->node) { |
---|
860 | | - test_err("couldn't allocate dummy buffer"); |
---|
| 856 | + test_std_err(TEST_ALLOC_ROOT); |
---|
861 | 857 | goto out; |
---|
862 | 858 | } |
---|
863 | 859 | |
---|
864 | | - extent_buffer_get(root->node); |
---|
865 | 860 | btrfs_set_header_nritems(root->node, 0); |
---|
866 | 861 | btrfs_set_header_level(root->node, 0); |
---|
867 | 862 | BTRFS_I(inode)->root = root; |
---|
.. | .. |
---|
874 | 869 | insert_inode_item_key(root); |
---|
875 | 870 | insert_extent(root, sectorsize, sectorsize, sectorsize, 0, sectorsize, |
---|
876 | 871 | sectorsize, BTRFS_FILE_EXTENT_REG, 0, 1); |
---|
877 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize, 0); |
---|
| 872 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, 0, 2 * sectorsize); |
---|
878 | 873 | if (IS_ERR(em)) { |
---|
879 | 874 | test_err("got an error when we shouldn't have"); |
---|
880 | 875 | goto out; |
---|
.. | .. |
---|
896 | 891 | } |
---|
897 | 892 | free_extent_map(em); |
---|
898 | 893 | |
---|
899 | | - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize, |
---|
900 | | - 2 * sectorsize, 0); |
---|
| 894 | + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, sectorsize, 2 * sectorsize); |
---|
901 | 895 | if (IS_ERR(em)) { |
---|
902 | 896 | test_err("got an error when we shouldn't have"); |
---|
903 | 897 | goto out; |
---|
.. | .. |
---|
934 | 928 | struct btrfs_root *root = NULL; |
---|
935 | 929 | int ret = -ENOMEM; |
---|
936 | 930 | |
---|
| 931 | + test_msg("running outstanding_extents tests"); |
---|
| 932 | + |
---|
937 | 933 | inode = btrfs_new_test_inode(); |
---|
938 | 934 | if (!inode) { |
---|
939 | | - test_err("couldn't allocate inode"); |
---|
| 935 | + test_std_err(TEST_ALLOC_INODE); |
---|
940 | 936 | return ret; |
---|
941 | 937 | } |
---|
942 | 938 | |
---|
943 | 939 | fs_info = btrfs_alloc_dummy_fs_info(nodesize, sectorsize); |
---|
944 | 940 | if (!fs_info) { |
---|
945 | | - test_err("couldn't allocate dummy fs info"); |
---|
| 941 | + test_std_err(TEST_ALLOC_FS_INFO); |
---|
946 | 942 | goto out; |
---|
947 | 943 | } |
---|
948 | 944 | |
---|
949 | 945 | root = btrfs_alloc_dummy_root(fs_info); |
---|
950 | 946 | if (IS_ERR(root)) { |
---|
951 | | - test_err("couldn't allocate root"); |
---|
| 947 | + test_std_err(TEST_ALLOC_ROOT); |
---|
952 | 948 | goto out; |
---|
953 | 949 | } |
---|
954 | 950 | |
---|
955 | 951 | BTRFS_I(inode)->root = root; |
---|
956 | | - btrfs_test_inode_set_ops(inode); |
---|
957 | 952 | |
---|
958 | 953 | /* [BTRFS_MAX_EXTENT_SIZE] */ |
---|
959 | | - ret = btrfs_set_extent_delalloc(inode, 0, BTRFS_MAX_EXTENT_SIZE - 1, 0, |
---|
960 | | - NULL, 0); |
---|
| 954 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), 0, |
---|
| 955 | + BTRFS_MAX_EXTENT_SIZE - 1, 0, NULL); |
---|
961 | 956 | if (ret) { |
---|
962 | 957 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
963 | 958 | goto out; |
---|
.. | .. |
---|
970 | 965 | } |
---|
971 | 966 | |
---|
972 | 967 | /* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */ |
---|
973 | | - ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE, |
---|
| 968 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), BTRFS_MAX_EXTENT_SIZE, |
---|
974 | 969 | BTRFS_MAX_EXTENT_SIZE + sectorsize - 1, |
---|
975 | | - 0, NULL, 0); |
---|
| 970 | + 0, NULL); |
---|
976 | 971 | if (ret) { |
---|
977 | 972 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
978 | 973 | goto out; |
---|
.. | .. |
---|
988 | 983 | ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, |
---|
989 | 984 | BTRFS_MAX_EXTENT_SIZE >> 1, |
---|
990 | 985 | (BTRFS_MAX_EXTENT_SIZE >> 1) + sectorsize - 1, |
---|
991 | | - EXTENT_DELALLOC | EXTENT_DIRTY | |
---|
| 986 | + EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | |
---|
992 | 987 | EXTENT_UPTODATE, 0, 0, NULL); |
---|
993 | 988 | if (ret) { |
---|
994 | 989 | test_err("clear_extent_bit returned %d", ret); |
---|
.. | .. |
---|
1002 | 997 | } |
---|
1003 | 998 | |
---|
1004 | 999 | /* [BTRFS_MAX_EXTENT_SIZE][sectorsize] */ |
---|
1005 | | - ret = btrfs_set_extent_delalloc(inode, BTRFS_MAX_EXTENT_SIZE >> 1, |
---|
| 1000 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), BTRFS_MAX_EXTENT_SIZE >> 1, |
---|
1006 | 1001 | (BTRFS_MAX_EXTENT_SIZE >> 1) |
---|
1007 | 1002 | + sectorsize - 1, |
---|
1008 | | - 0, NULL, 0); |
---|
| 1003 | + 0, NULL); |
---|
1009 | 1004 | if (ret) { |
---|
1010 | 1005 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
1011 | 1006 | goto out; |
---|
.. | .. |
---|
1020 | 1015 | /* |
---|
1021 | 1016 | * [BTRFS_MAX_EXTENT_SIZE+sectorsize][sectorsize HOLE][BTRFS_MAX_EXTENT_SIZE+sectorsize] |
---|
1022 | 1017 | */ |
---|
1023 | | - ret = btrfs_set_extent_delalloc(inode, |
---|
| 1018 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), |
---|
1024 | 1019 | BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize, |
---|
1025 | 1020 | (BTRFS_MAX_EXTENT_SIZE << 1) + 3 * sectorsize - 1, |
---|
1026 | | - 0, NULL, 0); |
---|
| 1021 | + 0, NULL); |
---|
1027 | 1022 | if (ret) { |
---|
1028 | 1023 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
1029 | 1024 | goto out; |
---|
.. | .. |
---|
1038 | 1033 | /* |
---|
1039 | 1034 | * [BTRFS_MAX_EXTENT_SIZE+sectorsize][sectorsize][BTRFS_MAX_EXTENT_SIZE+sectorsize] |
---|
1040 | 1035 | */ |
---|
1041 | | - ret = btrfs_set_extent_delalloc(inode, |
---|
| 1036 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), |
---|
1042 | 1037 | BTRFS_MAX_EXTENT_SIZE + sectorsize, |
---|
1043 | | - BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL, 0); |
---|
| 1038 | + BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL); |
---|
1044 | 1039 | if (ret) { |
---|
1045 | 1040 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
1046 | 1041 | goto out; |
---|
.. | .. |
---|
1056 | 1051 | ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, |
---|
1057 | 1052 | BTRFS_MAX_EXTENT_SIZE + sectorsize, |
---|
1058 | 1053 | BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, |
---|
1059 | | - EXTENT_DIRTY | EXTENT_DELALLOC | |
---|
| 1054 | + EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | |
---|
1060 | 1055 | EXTENT_UPTODATE, 0, 0, NULL); |
---|
1061 | 1056 | if (ret) { |
---|
1062 | 1057 | test_err("clear_extent_bit returned %d", ret); |
---|
.. | .. |
---|
1073 | 1068 | * Refill the hole again just for good measure, because I thought it |
---|
1074 | 1069 | * might fail and I'd rather satisfy my paranoia at this point. |
---|
1075 | 1070 | */ |
---|
1076 | | - ret = btrfs_set_extent_delalloc(inode, |
---|
| 1071 | + ret = btrfs_set_extent_delalloc(BTRFS_I(inode), |
---|
1077 | 1072 | BTRFS_MAX_EXTENT_SIZE + sectorsize, |
---|
1078 | | - BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL, 0); |
---|
| 1073 | + BTRFS_MAX_EXTENT_SIZE + 2 * sectorsize - 1, 0, NULL); |
---|
1079 | 1074 | if (ret) { |
---|
1080 | 1075 | test_err("btrfs_set_extent_delalloc returned %d", ret); |
---|
1081 | 1076 | goto out; |
---|
.. | .. |
---|
1089 | 1084 | |
---|
1090 | 1085 | /* Empty */ |
---|
1091 | 1086 | ret = clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, |
---|
1092 | | - EXTENT_DIRTY | EXTENT_DELALLOC | |
---|
| 1087 | + EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | |
---|
1093 | 1088 | EXTENT_UPTODATE, 0, 0, NULL); |
---|
1094 | 1089 | if (ret) { |
---|
1095 | 1090 | test_err("clear_extent_bit returned %d", ret); |
---|
.. | .. |
---|
1105 | 1100 | out: |
---|
1106 | 1101 | if (ret) |
---|
1107 | 1102 | clear_extent_bit(&BTRFS_I(inode)->io_tree, 0, (u64)-1, |
---|
1108 | | - EXTENT_DIRTY | EXTENT_DELALLOC | |
---|
| 1103 | + EXTENT_DELALLOC | EXTENT_DELALLOC_NEW | |
---|
1109 | 1104 | EXTENT_UPTODATE, 0, 0, NULL); |
---|
1110 | 1105 | iput(inode); |
---|
1111 | 1106 | btrfs_free_dummy_root(root); |
---|
.. | .. |
---|
1117 | 1112 | { |
---|
1118 | 1113 | int ret; |
---|
1119 | 1114 | |
---|
| 1115 | + test_msg("running inode tests"); |
---|
| 1116 | + |
---|
1120 | 1117 | set_bit(EXTENT_FLAG_COMPRESSED, &compressed_only); |
---|
1121 | 1118 | set_bit(EXTENT_FLAG_PREALLOC, &prealloc_only); |
---|
1122 | 1119 | |
---|
1123 | | - test_msg("running btrfs_get_extent tests"); |
---|
1124 | 1120 | ret = test_btrfs_get_extent(sectorsize, nodesize); |
---|
1125 | 1121 | if (ret) |
---|
1126 | 1122 | return ret; |
---|
1127 | | - test_msg("running hole first btrfs_get_extent test"); |
---|
1128 | 1123 | ret = test_hole_first(sectorsize, nodesize); |
---|
1129 | 1124 | if (ret) |
---|
1130 | 1125 | return ret; |
---|
1131 | | - test_msg("running outstanding_extents tests"); |
---|
1132 | 1126 | return test_extent_accounting(sectorsize, nodesize); |
---|
1133 | 1127 | } |
---|