Merge branch 'for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

+11 -4

fs/btrfs/async-thread.c

··· 273 273 unsigned long flags; 274 274 275 275 while (1) { 276 + void *wtag; 277 + 276 278 spin_lock_irqsave(lock, flags); 277 279 if (list_empty(list)) 278 280 break; ··· 301 299 spin_unlock_irqrestore(lock, flags); 302 300 303 301 /* 304 - * we don't want to call the ordered free functions 305 - * with the lock held though 302 + * We don't want to call the ordered free functions with the 303 + * lock held though. Save the work as tag for the trace event, 304 + * because the callback could free the structure. 306 305 */ 306 + wtag = work; 307 307 work->ordered_free(work); 308 - trace_btrfs_all_work_done(work); 308 + trace_btrfs_all_work_done(wq->fs_info, wtag); 309 309 } 310 310 spin_unlock_irqrestore(lock, flags); 311 311 } ··· 315 311 static void normal_work_helper(struct btrfs_work *work) 316 312 { 317 313 struct __btrfs_workqueue *wq; 314 + void *wtag; 318 315 int need_order = 0; 319 316 320 317 /* ··· 329 324 if (work->ordered_func) 330 325 need_order = 1; 331 326 wq = work->wq; 327 + /* Safe for tracepoints in case work gets freed by the callback */ 328 + wtag = work; 332 329 333 330 trace_btrfs_work_sched(work); 334 331 thresh_exec_hook(wq); ··· 340 333 run_ordered_work(wq); 341 334 } 342 335 if (!need_order) 343 - trace_btrfs_all_work_done(work); 336 + trace_btrfs_all_work_done(wq->fs_info, wtag); 344 337 } 345 338 346 339 void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func,

+6 -2

fs/btrfs/extent-tree.c

··· 2522 2522 if (ref && ref->seq && 2523 2523 btrfs_check_delayed_seq(fs_info, delayed_refs, ref->seq)) { 2524 2524 spin_unlock(&locked_ref->lock); 2525 - btrfs_delayed_ref_unlock(locked_ref); 2526 2525 spin_lock(&delayed_refs->lock); 2527 2526 locked_ref->processing = 0; 2528 2527 delayed_refs->num_heads_ready++; 2529 2528 spin_unlock(&delayed_refs->lock); 2529 + btrfs_delayed_ref_unlock(locked_ref); 2530 2530 locked_ref = NULL; 2531 2531 cond_resched(); 2532 2532 count++; ··· 2572 2572 */ 2573 2573 if (must_insert_reserved) 2574 2574 locked_ref->must_insert_reserved = 1; 2575 + spin_lock(&delayed_refs->lock); 2575 2576 locked_ref->processing = 0; 2577 + delayed_refs->num_heads_ready++; 2578 + spin_unlock(&delayed_refs->lock); 2576 2579 btrfs_debug(fs_info, 2577 2580 "run_delayed_extent_op returned %d", 2578 2581 ret); ··· 7387 7384 7388 7385 spin_unlock(&cluster->refill_lock); 7389 7386 7390 - down_read(&used_bg->data_rwsem); 7387 + /* We should only have one-level nested. */ 7388 + down_read_nested(&used_bg->data_rwsem, SINGLE_DEPTH_NESTING); 7391 7389 7392 7390 spin_lock(&cluster->refill_lock); 7393 7391 if (used_bg == cluster->block_group)

+10 -3

fs/btrfs/inode.c

··· 7059 7059 write_unlock(&em_tree->lock); 7060 7060 out: 7061 7061 7062 - trace_btrfs_get_extent(root, em); 7062 + trace_btrfs_get_extent(root, inode, em); 7063 7063 7064 7064 btrfs_free_path(path); 7065 7065 if (trans) { ··· 7623 7623 * within our reservation, otherwise we need to adjust our inode 7624 7624 * counter appropriately. 7625 7625 */ 7626 - if (dio_data->outstanding_extents) { 7626 + if (dio_data->outstanding_extents >= num_extents) { 7627 7627 dio_data->outstanding_extents -= num_extents; 7628 7628 } else { 7629 + /* 7630 + * If dio write length has been split due to no large enough 7631 + * contiguous space, we need to compensate our inode counter 7632 + * appropriately. 7633 + */ 7634 + u64 num_needed = num_extents - dio_data->outstanding_extents; 7635 + 7629 7636 spin_lock(&BTRFS_I(inode)->lock); 7630 - BTRFS_I(inode)->outstanding_extents += num_extents; 7637 + BTRFS_I(inode)->outstanding_extents += num_needed; 7631 7638 spin_unlock(&BTRFS_I(inode)->lock); 7632 7639 } 7633 7640 }

+10 -3

fs/btrfs/tree-log.c

··· 37 37 */ 38 38 #define LOG_INODE_ALL 0 39 39 #define LOG_INODE_EXISTS 1 40 + #define LOG_OTHER_INODE 2 40 41 41 42 /* 42 43 * directory trouble cases ··· 4642 4641 if (S_ISDIR(inode->i_mode) || 4643 4642 (!test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, 4644 4643 &BTRFS_I(inode)->runtime_flags) && 4645 - inode_only == LOG_INODE_EXISTS)) 4644 + inode_only >= LOG_INODE_EXISTS)) 4646 4645 max_key.type = BTRFS_XATTR_ITEM_KEY; 4647 4646 else 4648 4647 max_key.type = (u8)-1; ··· 4666 4665 return ret; 4667 4666 } 4668 4667 4669 - mutex_lock(&BTRFS_I(inode)->log_mutex); 4668 + if (inode_only == LOG_OTHER_INODE) { 4669 + inode_only = LOG_INODE_EXISTS; 4670 + mutex_lock_nested(&BTRFS_I(inode)->log_mutex, 4671 + SINGLE_DEPTH_NESTING); 4672 + } else { 4673 + mutex_lock(&BTRFS_I(inode)->log_mutex); 4674 + } 4670 4675 4671 4676 /* 4672 4677 * a brute force approach to making sure we get the most uptodate ··· 4824 4817 * unpin it. 4825 4818 */ 4826 4819 err = btrfs_log_inode(trans, root, other_inode, 4827 - LOG_INODE_EXISTS, 4820 + LOG_OTHER_INODE, 4828 4821 0, LLONG_MAX, ctx); 4829 4822 iput(other_inode); 4830 4823 if (err)

+1 -3

fs/btrfs/uuid-tree.c

··· 352 352 353 353 out: 354 354 btrfs_free_path(path); 355 - if (ret) 356 - btrfs_warn(fs_info, "btrfs_uuid_tree_iterate failed %d", ret); 357 - return 0; 355 + return ret; 358 356 }

+79 -67

include/trace/events/btrfs.h

··· 130 130 BTRFS_I(inode)->root->root_key.objectid; 131 131 ), 132 132 133 - TP_printk_btrfs("root = %llu(%s), gen = %llu, ino = %lu, blocks = %llu, " 134 - "disk_i_size = %llu, last_trans = %llu, logged_trans = %llu", 133 + TP_printk_btrfs("root=%llu(%s) gen=%llu ino=%lu blocks=%llu " 134 + "disk_i_size=%llu last_trans=%llu logged_trans=%llu", 135 135 show_root_type(__entry->root_objectid), 136 136 (unsigned long long)__entry->generation, 137 137 (unsigned long)__entry->ino, ··· 184 184 185 185 TRACE_EVENT_CONDITION(btrfs_get_extent, 186 186 187 - TP_PROTO(struct btrfs_root *root, struct extent_map *map), 187 + TP_PROTO(struct btrfs_root *root, struct inode *inode, 188 + struct extent_map *map), 188 189 189 - TP_ARGS(root, map), 190 + TP_ARGS(root, inode, map), 190 191 191 192 TP_CONDITION(map), 192 193 193 194 TP_STRUCT__entry_btrfs( 194 195 __field( u64, root_objectid ) 196 + __field( u64, ino ) 195 197 __field( u64, start ) 196 198 __field( u64, len ) 197 199 __field( u64, orig_start ) ··· 206 204 207 205 TP_fast_assign_btrfs(root->fs_info, 208 206 __entry->root_objectid = root->root_key.objectid; 209 - __entry->start = map->start; 207 + __entry->ino = btrfs_ino(inode); 208 + __entry->start = map->start; 210 209 __entry->len = map->len; 211 210 __entry->orig_start = map->orig_start; 212 211 __entry->block_start = map->block_start; ··· 217 214 __entry->compress_type = map->compress_type; 218 215 ), 219 216 220 - TP_printk_btrfs("root = %llu(%s), start = %llu, len = %llu, " 221 - "orig_start = %llu, block_start = %llu(%s), " 222 - "block_len = %llu, flags = %s, refs = %u, " 223 - "compress_type = %u", 217 + TP_printk_btrfs("root=%llu(%s) ino=%llu start=%llu len=%llu " 218 + "orig_start=%llu block_start=%llu(%s) " 219 + "block_len=%llu flags=%s refs=%u " 220 + "compress_type=%u", 224 221 show_root_type(__entry->root_objectid), 222 + (unsigned long long)__entry->ino, 225 223 (unsigned long long)__entry->start, 226 224 (unsigned long long)__entry->len, 227 225 (unsigned long long)__entry->orig_start, ··· 263 259 __field( int, compress_type ) 264 260 __field( int, refs ) 265 261 __field( u64, root_objectid ) 262 + __field( u64, truncated_len ) 266 263 ), 267 264 268 265 TP_fast_assign_btrfs(btrfs_sb(inode->i_sb), ··· 278 273 __entry->refs = atomic_read(&ordered->refs); 279 274 __entry->root_objectid = 280 275 BTRFS_I(inode)->root->root_key.objectid; 276 + __entry->truncated_len = ordered->truncated_len; 281 277 ), 282 278 283 - TP_printk_btrfs("root = %llu(%s), ino = %llu, file_offset = %llu, " 284 - "start = %llu, len = %llu, disk_len = %llu, " 285 - "bytes_left = %llu, flags = %s, compress_type = %d, " 286 - "refs = %d", 279 + TP_printk_btrfs("root=%llu(%s) ino=%llu file_offset=%llu " 280 + "start=%llu len=%llu disk_len=%llu " 281 + "truncated_len=%llu " 282 + "bytes_left=%llu flags=%s compress_type=%d " 283 + "refs=%d", 287 284 show_root_type(__entry->root_objectid), 288 285 (unsigned long long)__entry->ino, 289 286 (unsigned long long)__entry->file_offset, 290 287 (unsigned long long)__entry->start, 291 288 (unsigned long long)__entry->len, 292 289 (unsigned long long)__entry->disk_len, 290 + (unsigned long long)__entry->truncated_len, 293 291 (unsigned long long)__entry->bytes_left, 294 292 show_ordered_flags(__entry->flags), 295 293 __entry->compress_type, __entry->refs) ··· 362 354 BTRFS_I(inode)->root->root_key.objectid; 363 355 ), 364 356 365 - TP_printk_btrfs("root = %llu(%s), ino = %lu, page_index = %lu, " 366 - "nr_to_write = %ld, pages_skipped = %ld, range_start = %llu, " 367 - "range_end = %llu, for_kupdate = %d, " 368 - "for_reclaim = %d, range_cyclic = %d, writeback_index = %lu", 357 + TP_printk_btrfs("root=%llu(%s) ino=%lu page_index=%lu " 358 + "nr_to_write=%ld pages_skipped=%ld range_start=%llu " 359 + "range_end=%llu for_kupdate=%d " 360 + "for_reclaim=%d range_cyclic=%d writeback_index=%lu", 369 361 show_root_type(__entry->root_objectid), 370 362 (unsigned long)__entry->ino, __entry->index, 371 363 __entry->nr_to_write, __entry->pages_skipped, ··· 408 400 BTRFS_I(page->mapping->host)->root->root_key.objectid; 409 401 ), 410 402 411 - TP_printk_btrfs("root = %llu(%s), ino = %lu, page_index = %lu, start = %llu, " 412 - "end = %llu, uptodate = %d", 403 + TP_printk_btrfs("root=%llu(%s) ino=%lu page_index=%lu start=%llu " 404 + "end=%llu uptodate=%d", 413 405 show_root_type(__entry->root_objectid), 414 406 (unsigned long)__entry->ino, (unsigned long)__entry->index, 415 407 (unsigned long long)__entry->start, ··· 441 433 BTRFS_I(inode)->root->root_key.objectid; 442 434 ), 443 435 444 - TP_printk_btrfs("root = %llu(%s), ino = %ld, parent = %ld, datasync = %d", 436 + TP_printk_btrfs("root=%llu(%s) ino=%ld parent=%ld datasync=%d", 445 437 show_root_type(__entry->root_objectid), 446 438 (unsigned long)__entry->ino, (unsigned long)__entry->parent, 447 439 __entry->datasync) ··· 492 484 __entry->create = create; 493 485 ), 494 486 495 - TP_printk("%pU: block_group offset = %llu, size = %llu, " 496 - "flags = %llu(%s), bytes_used = %llu, bytes_super = %llu, " 497 - "create = %d", __entry->fsid, 487 + TP_printk("%pU: block_group offset=%llu size=%llu " 488 + "flags=%llu(%s) bytes_used=%llu bytes_super=%llu " 489 + "create=%d", __entry->fsid, 498 490 (unsigned long long)__entry->offset, 499 491 (unsigned long long)__entry->size, 500 492 (unsigned long long)__entry->flags, ··· 543 535 __entry->seq = ref->seq; 544 536 ), 545 537 546 - TP_printk_btrfs("bytenr = %llu, num_bytes = %llu, action = %s, " 547 - "parent = %llu(%s), ref_root = %llu(%s), level = %d, " 548 - "type = %s, seq = %llu", 538 + TP_printk_btrfs("bytenr=%llu num_bytes=%llu action=%s " 539 + "parent=%llu(%s) ref_root=%llu(%s) level=%d " 540 + "type=%s seq=%llu", 549 541 (unsigned long long)__entry->bytenr, 550 542 (unsigned long long)__entry->num_bytes, 551 543 show_ref_action(__entry->action), ··· 608 600 __entry->seq = ref->seq; 609 601 ), 610 602 611 - TP_printk_btrfs("bytenr = %llu, num_bytes = %llu, action = %s, " 612 - "parent = %llu(%s), ref_root = %llu(%s), owner = %llu, " 613 - "offset = %llu, type = %s, seq = %llu", 603 + TP_printk_btrfs("bytenr=%llu num_bytes=%llu action=%s " 604 + "parent=%llu(%s) ref_root=%llu(%s) owner=%llu " 605 + "offset=%llu type=%s seq=%llu", 614 606 (unsigned long long)__entry->bytenr, 615 607 (unsigned long long)__entry->num_bytes, 616 608 show_ref_action(__entry->action), ··· 665 657 __entry->is_data = head_ref->is_data; 666 658 ), 667 659 668 - TP_printk_btrfs("bytenr = %llu, num_bytes = %llu, action = %s, is_data = %d", 660 + TP_printk_btrfs("bytenr=%llu num_bytes=%llu action=%s is_data=%d", 669 661 (unsigned long long)__entry->bytenr, 670 662 (unsigned long long)__entry->num_bytes, 671 663 show_ref_action(__entry->action), ··· 729 721 __entry->root_objectid = fs_info->chunk_root->root_key.objectid; 730 722 ), 731 723 732 - TP_printk_btrfs("root = %llu(%s), offset = %llu, size = %llu, " 733 - "num_stripes = %d, sub_stripes = %d, type = %s", 724 + TP_printk_btrfs("root=%llu(%s) offset=%llu size=%llu " 725 + "num_stripes=%d sub_stripes=%d type=%s", 734 726 show_root_type(__entry->root_objectid), 735 727 (unsigned long long)__entry->offset, 736 728 (unsigned long long)__entry->size, ··· 779 771 __entry->cow_level = btrfs_header_level(cow); 780 772 ), 781 773 782 - TP_printk_btrfs("root = %llu(%s), refs = %d, orig_buf = %llu " 783 - "(orig_level = %d), cow_buf = %llu (cow_level = %d)", 774 + TP_printk_btrfs("root=%llu(%s) refs=%d orig_buf=%llu " 775 + "(orig_level=%d) cow_buf=%llu (cow_level=%d)", 784 776 show_root_type(__entry->root_objectid), 785 777 __entry->refs, 786 778 (unsigned long long)__entry->buf_start, ··· 844 836 __assign_str(reason, reason) 845 837 ), 846 838 847 - TP_printk("%pU: %s: flush = %d(%s), flags = %llu(%s), bytes = %llu", 839 + TP_printk("%pU: %s: flush=%d(%s) flags=%llu(%s) bytes=%llu", 848 840 __entry->fsid, __get_str(reason), __entry->flush, 849 841 show_flush_action(__entry->flush), 850 842 (unsigned long long)__entry->flags, ··· 887 879 __entry->ret = ret; 888 880 ), 889 881 890 - TP_printk("%pU: state = %d(%s), flags = %llu(%s), num_bytes = %llu, " 891 - "orig_bytes = %llu, ret = %d", __entry->fsid, __entry->state, 882 + TP_printk("%pU: state=%d(%s) flags=%llu(%s) num_bytes=%llu " 883 + "orig_bytes=%llu ret=%d", __entry->fsid, __entry->state, 892 884 show_flush_state(__entry->state), 893 885 (unsigned long long)__entry->flags, 894 886 __print_flags((unsigned long)__entry->flags, "|", ··· 913 905 __entry->len = len; 914 906 ), 915 907 916 - TP_printk_btrfs("root = %llu(%s), start = %llu, len = %llu", 908 + TP_printk_btrfs("root=%llu(%s) start=%llu len=%llu", 917 909 show_root_type(BTRFS_EXTENT_TREE_OBJECTID), 918 910 (unsigned long long)__entry->start, 919 911 (unsigned long long)__entry->len) ··· 952 944 __entry->data = data; 953 945 ), 954 946 955 - TP_printk_btrfs("root = %Lu(%s), len = %Lu, empty_size = %Lu, flags = %Lu(%s)", 947 + TP_printk_btrfs("root=%Lu(%s) len=%Lu empty_size=%Lu flags=%Lu(%s)", 956 948 show_root_type(BTRFS_EXTENT_TREE_OBJECTID), 957 949 __entry->num_bytes, __entry->empty_size, __entry->data, 958 950 __print_flags((unsigned long)__entry->data, "|", ··· 981 973 __entry->len = len; 982 974 ), 983 975 984 - TP_printk_btrfs("root = %Lu(%s), block_group = %Lu, flags = %Lu(%s), " 985 - "start = %Lu, len = %Lu", 976 + TP_printk_btrfs("root=%Lu(%s) block_group=%Lu flags=%Lu(%s) " 977 + "start=%Lu len=%Lu", 986 978 show_root_type(BTRFS_EXTENT_TREE_OBJECTID), 987 979 __entry->bg_objectid, 988 980 __entry->flags, __print_flags((unsigned long)__entry->flags, ··· 1033 1025 __entry->min_bytes = min_bytes; 1034 1026 ), 1035 1027 1036 - TP_printk_btrfs("block_group = %Lu, flags = %Lu(%s), start = %Lu, len = %Lu," 1037 - " empty_size = %Lu, min_bytes = %Lu", __entry->bg_objectid, 1028 + TP_printk_btrfs("block_group=%Lu flags=%Lu(%s) start=%Lu len=%Lu " 1029 + "empty_size=%Lu min_bytes=%Lu", __entry->bg_objectid, 1038 1030 __entry->flags, 1039 1031 __print_flags((unsigned long)__entry->flags, "|", 1040 1032 BTRFS_GROUP_FLAGS), __entry->start, ··· 1055 1047 __entry->bg_objectid = block_group->key.objectid; 1056 1048 ), 1057 1049 1058 - TP_printk_btrfs("block_group = %Lu", __entry->bg_objectid) 1050 + TP_printk_btrfs("block_group=%Lu", __entry->bg_objectid) 1059 1051 ); 1060 1052 1061 1053 TRACE_EVENT(btrfs_setup_cluster, ··· 1083 1075 __entry->bitmap = bitmap; 1084 1076 ), 1085 1077 1086 - TP_printk_btrfs("block_group = %Lu, flags = %Lu(%s), window_start = %Lu, " 1087 - "size = %Lu, max_size = %Lu, bitmap = %d", 1078 + TP_printk_btrfs("block_group=%Lu flags=%Lu(%s) window_start=%Lu " 1079 + "size=%Lu max_size=%Lu bitmap=%d", 1088 1080 __entry->bg_objectid, 1089 1081 __entry->flags, 1090 1082 __print_flags((unsigned long)__entry->flags, "|", ··· 1111 1103 __entry->ip = IP 1112 1104 ), 1113 1105 1114 - TP_printk("state=%p; mask = %s; caller = %pS", __entry->state, 1106 + TP_printk("state=%p mask=%s caller=%pS", __entry->state, 1115 1107 show_gfp_flags(__entry->mask), (void *)__entry->ip) 1116 1108 ); 1117 1109 ··· 1131 1123 __entry->ip = IP 1132 1124 ), 1133 1125 1134 - TP_printk(" state=%p; caller = %pS", __entry->state, 1126 + TP_printk("state=%p caller=%pS", __entry->state, 1135 1127 (void *)__entry->ip) 1136 1128 ); 1137 1129 ··· 1159 1151 __entry->normal_work = &work->normal_work; 1160 1152 ), 1161 1153 1162 - TP_printk_btrfs("work=%p (normal_work=%p), wq=%p, func=%pf, ordered_func=%p," 1163 - " ordered_free=%p", 1154 + TP_printk_btrfs("work=%p (normal_work=%p) wq=%p func=%pf ordered_func=%p " 1155 + "ordered_free=%p", 1164 1156 __entry->work, __entry->normal_work, __entry->wq, 1165 1157 __entry->func, __entry->ordered_func, __entry->ordered_free) 1166 1158 ); 1167 1159 1168 - /* For situiations that the work is freed */ 1160 + /* 1161 + * For situiations when the work is freed, we pass fs_info and a tag that that 1162 + * matches address of the work structure so it can be paired with the 1163 + * scheduling event. 1164 + */ 1169 1165 DECLARE_EVENT_CLASS(btrfs__work__done, 1170 1166 1171 - TP_PROTO(struct btrfs_work *work), 1167 + TP_PROTO(struct btrfs_fs_info *fs_info, void *wtag), 1172 1168 1173 - TP_ARGS(work), 1169 + TP_ARGS(fs_info, wtag), 1174 1170 1175 1171 TP_STRUCT__entry_btrfs( 1176 - __field( void *, work ) 1172 + __field( void *, wtag ) 1177 1173 ), 1178 1174 1179 - TP_fast_assign_btrfs(btrfs_work_owner(work), 1180 - __entry->work = work; 1175 + TP_fast_assign_btrfs(fs_info, 1176 + __entry->wtag = wtag; 1181 1177 ), 1182 1178 1183 - TP_printk_btrfs("work->%p", __entry->work) 1179 + TP_printk_btrfs("work->%p", __entry->wtag) 1184 1180 ); 1185 1181 1186 1182 DEFINE_EVENT(btrfs__work, btrfs_work_queued, ··· 1203 1191 1204 1192 DEFINE_EVENT(btrfs__work__done, btrfs_all_work_done, 1205 1193 1206 - TP_PROTO(struct btrfs_work *work), 1194 + TP_PROTO(struct btrfs_fs_info *fs_info, void *wtag), 1207 1195 1208 - TP_ARGS(work) 1196 + TP_ARGS(fs_info, wtag) 1209 1197 ); 1210 1198 1211 1199 DEFINE_EVENT(btrfs__work, btrfs_ordered_sched, ··· 1233 1221 __entry->high = high; 1234 1222 ), 1235 1223 1236 - TP_printk_btrfs("name=%s%s, wq=%p", __get_str(name), 1224 + TP_printk_btrfs("name=%s%s wq=%p", __get_str(name), 1237 1225 __print_flags(__entry->high, "", 1238 1226 {(WQ_HIGHPRI), "-high"}), 1239 1227 __entry->wq) ··· 1288 1276 __entry->free_reserved = free_reserved; 1289 1277 ), 1290 1278 1291 - TP_printk_btrfs("rootid=%llu, ino=%lu, free_reserved=%llu", 1279 + TP_printk_btrfs("rootid=%llu ino=%lu free_reserved=%llu", 1292 1280 __entry->rootid, __entry->ino, __entry->free_reserved) 1293 1281 ); 1294 1282 ··· 1335 1323 __entry->op = op; 1336 1324 ), 1337 1325 1338 - TP_printk_btrfs("root=%llu, ino=%lu, start=%llu, len=%llu, reserved=%llu, op=%s", 1326 + TP_printk_btrfs("root=%llu ino=%lu start=%llu len=%llu reserved=%llu op=%s", 1339 1327 __entry->rootid, __entry->ino, __entry->start, __entry->len, 1340 1328 __entry->reserved, 1341 1329 __print_flags((unsigned long)__entry->op, "", ··· 1373 1361 __entry->reserved = reserved; 1374 1362 ), 1375 1363 1376 - TP_printk_btrfs("root=%llu, reserved=%llu, op=free", 1364 + TP_printk_btrfs("root=%llu reserved=%llu op=free", 1377 1365 __entry->ref_root, __entry->reserved) 1378 1366 ); 1379 1367 ··· 1400 1388 __entry->num_bytes = rec->num_bytes; 1401 1389 ), 1402 1390 1403 - TP_printk_btrfs("bytenr = %llu, num_bytes = %llu", 1391 + TP_printk_btrfs("bytenr=%llu num_bytes=%llu", 1404 1392 (unsigned long long)__entry->bytenr, 1405 1393 (unsigned long long)__entry->num_bytes) 1406 1394 ); ··· 1442 1430 __entry->nr_new_roots = nr_new_roots; 1443 1431 ), 1444 1432 1445 - TP_printk_btrfs("bytenr = %llu, num_bytes = %llu, nr_old_roots = %llu, " 1446 - "nr_new_roots = %llu", 1433 + TP_printk_btrfs("bytenr=%llu num_bytes=%llu nr_old_roots=%llu " 1434 + "nr_new_roots=%llu", 1447 1435 __entry->bytenr, 1448 1436 __entry->num_bytes, 1449 1437 __entry->nr_old_roots, ··· 1469 1457 __entry->cur_new_count = cur_new_count; 1470 1458 ), 1471 1459 1472 - TP_printk_btrfs("qgid = %llu, cur_old_count = %llu, cur_new_count = %llu", 1460 + TP_printk_btrfs("qgid=%llu cur_old_count=%llu cur_new_count=%llu", 1473 1461 __entry->qgid, 1474 1462 __entry->cur_old_count, 1475 1463 __entry->cur_new_count)

Configure Feed

Configure Feed