diff options
Diffstat (limited to 'fs/fscache/page.c')
-rw-r--r-- | fs/fscache/page.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/fs/fscache/page.c b/fs/fscache/page.c index 41c441c2058d..a2a5d19ece6a 100644 --- a/fs/fscache/page.c +++ b/fs/fscache/page.c | |||
@@ -155,11 +155,9 @@ static void fscache_attr_changed_op(struct fscache_operation *op) | |||
155 | fscache_stat(&fscache_n_attr_changed_calls); | 155 | fscache_stat(&fscache_n_attr_changed_calls); |
156 | 156 | ||
157 | if (fscache_object_is_active(object)) { | 157 | if (fscache_object_is_active(object)) { |
158 | fscache_set_op_state(op, "CallFS"); | ||
159 | fscache_stat(&fscache_n_cop_attr_changed); | 158 | fscache_stat(&fscache_n_cop_attr_changed); |
160 | ret = object->cache->ops->attr_changed(object); | 159 | ret = object->cache->ops->attr_changed(object); |
161 | fscache_stat_d(&fscache_n_cop_attr_changed); | 160 | fscache_stat_d(&fscache_n_cop_attr_changed); |
162 | fscache_set_op_state(op, "Done"); | ||
163 | if (ret < 0) | 161 | if (ret < 0) |
164 | fscache_abort_object(object); | 162 | fscache_abort_object(object); |
165 | } | 163 | } |
@@ -190,7 +188,6 @@ int __fscache_attr_changed(struct fscache_cookie *cookie) | |||
190 | 188 | ||
191 | fscache_operation_init(op, fscache_attr_changed_op, NULL); | 189 | fscache_operation_init(op, fscache_attr_changed_op, NULL); |
192 | op->flags = FSCACHE_OP_ASYNC | (1 << FSCACHE_OP_EXCLUSIVE); | 190 | op->flags = FSCACHE_OP_ASYNC | (1 << FSCACHE_OP_EXCLUSIVE); |
193 | fscache_set_op_name(op, "Attr"); | ||
194 | 191 | ||
195 | spin_lock(&cookie->lock); | 192 | spin_lock(&cookie->lock); |
196 | 193 | ||
@@ -257,7 +254,6 @@ static struct fscache_retrieval *fscache_alloc_retrieval( | |||
257 | op->context = context; | 254 | op->context = context; |
258 | op->start_time = jiffies; | 255 | op->start_time = jiffies; |
259 | INIT_LIST_HEAD(&op->to_do); | 256 | INIT_LIST_HEAD(&op->to_do); |
260 | fscache_set_op_name(&op->op, "Retr"); | ||
261 | return op; | 257 | return op; |
262 | } | 258 | } |
263 | 259 | ||
@@ -368,7 +364,6 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie, | |||
368 | _leave(" = -ENOMEM"); | 364 | _leave(" = -ENOMEM"); |
369 | return -ENOMEM; | 365 | return -ENOMEM; |
370 | } | 366 | } |
371 | fscache_set_op_name(&op->op, "RetrRA1"); | ||
372 | 367 | ||
373 | spin_lock(&cookie->lock); | 368 | spin_lock(&cookie->lock); |
374 | 369 | ||
@@ -487,7 +482,6 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie, | |||
487 | op = fscache_alloc_retrieval(mapping, end_io_func, context); | 482 | op = fscache_alloc_retrieval(mapping, end_io_func, context); |
488 | if (!op) | 483 | if (!op) |
489 | return -ENOMEM; | 484 | return -ENOMEM; |
490 | fscache_set_op_name(&op->op, "RetrRAN"); | ||
491 | 485 | ||
492 | spin_lock(&cookie->lock); | 486 | spin_lock(&cookie->lock); |
493 | 487 | ||
@@ -589,7 +583,6 @@ int __fscache_alloc_page(struct fscache_cookie *cookie, | |||
589 | op = fscache_alloc_retrieval(page->mapping, NULL, NULL); | 583 | op = fscache_alloc_retrieval(page->mapping, NULL, NULL); |
590 | if (!op) | 584 | if (!op) |
591 | return -ENOMEM; | 585 | return -ENOMEM; |
592 | fscache_set_op_name(&op->op, "RetrAL1"); | ||
593 | 586 | ||
594 | spin_lock(&cookie->lock); | 587 | spin_lock(&cookie->lock); |
595 | 588 | ||
@@ -662,8 +655,6 @@ static void fscache_write_op(struct fscache_operation *_op) | |||
662 | 655 | ||
663 | _enter("{OP%x,%d}", op->op.debug_id, atomic_read(&op->op.usage)); | 656 | _enter("{OP%x,%d}", op->op.debug_id, atomic_read(&op->op.usage)); |
664 | 657 | ||
665 | fscache_set_op_state(&op->op, "GetPage"); | ||
666 | |||
667 | spin_lock(&object->lock); | 658 | spin_lock(&object->lock); |
668 | cookie = object->cookie; | 659 | cookie = object->cookie; |
669 | 660 | ||
@@ -698,15 +689,12 @@ static void fscache_write_op(struct fscache_operation *_op) | |||
698 | spin_unlock(&cookie->stores_lock); | 689 | spin_unlock(&cookie->stores_lock); |
699 | spin_unlock(&object->lock); | 690 | spin_unlock(&object->lock); |
700 | 691 | ||
701 | fscache_set_op_state(&op->op, "Store"); | ||
702 | fscache_stat(&fscache_n_store_pages); | 692 | fscache_stat(&fscache_n_store_pages); |
703 | fscache_stat(&fscache_n_cop_write_page); | 693 | fscache_stat(&fscache_n_cop_write_page); |
704 | ret = object->cache->ops->write_page(op, page); | 694 | ret = object->cache->ops->write_page(op, page); |
705 | fscache_stat_d(&fscache_n_cop_write_page); | 695 | fscache_stat_d(&fscache_n_cop_write_page); |
706 | fscache_set_op_state(&op->op, "EndWrite"); | ||
707 | fscache_end_page_write(object, page); | 696 | fscache_end_page_write(object, page); |
708 | if (ret < 0) { | 697 | if (ret < 0) { |
709 | fscache_set_op_state(&op->op, "Abort"); | ||
710 | fscache_abort_object(object); | 698 | fscache_abort_object(object); |
711 | } else { | 699 | } else { |
712 | fscache_enqueue_operation(&op->op); | 700 | fscache_enqueue_operation(&op->op); |
@@ -778,7 +766,6 @@ int __fscache_write_page(struct fscache_cookie *cookie, | |||
778 | fscache_operation_init(&op->op, fscache_write_op, | 766 | fscache_operation_init(&op->op, fscache_write_op, |
779 | fscache_release_write_op); | 767 | fscache_release_write_op); |
780 | op->op.flags = FSCACHE_OP_ASYNC | (1 << FSCACHE_OP_WAITING); | 768 | op->op.flags = FSCACHE_OP_ASYNC | (1 << FSCACHE_OP_WAITING); |
781 | fscache_set_op_name(&op->op, "Write1"); | ||
782 | 769 | ||
783 | ret = radix_tree_preload(gfp & ~__GFP_HIGHMEM); | 770 | ret = radix_tree_preload(gfp & ~__GFP_HIGHMEM); |
784 | if (ret < 0) | 771 | if (ret < 0) |