diff options
| -rw-r--r-- | fs/fscache/page.c | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/fs/fscache/page.c b/fs/fscache/page.c index 47aefd376e54..723b889fd219 100644 --- a/fs/fscache/page.c +++ b/fs/fscache/page.c | |||
| @@ -710,30 +710,26 @@ static void fscache_write_op(struct fscache_operation *_op) | |||
| 710 | goto superseded; | 710 | goto superseded; |
| 711 | } | 711 | } |
| 712 | 712 | ||
| 713 | if (page) { | 713 | radix_tree_tag_set(&cookie->stores, page->index, |
| 714 | radix_tree_tag_set(&cookie->stores, page->index, | 714 | FSCACHE_COOKIE_STORING_TAG); |
| 715 | FSCACHE_COOKIE_STORING_TAG); | 715 | radix_tree_tag_clear(&cookie->stores, page->index, |
| 716 | radix_tree_tag_clear(&cookie->stores, page->index, | 716 | FSCACHE_COOKIE_PENDING_TAG); |
| 717 | FSCACHE_COOKIE_PENDING_TAG); | ||
| 718 | } | ||
| 719 | 717 | ||
| 720 | spin_unlock(&cookie->stores_lock); | 718 | spin_unlock(&cookie->stores_lock); |
| 721 | spin_unlock(&object->lock); | 719 | spin_unlock(&object->lock); |
| 722 | 720 | ||
| 723 | if (page) { | 721 | fscache_set_op_state(&op->op, "Store"); |
| 724 | fscache_set_op_state(&op->op, "Store"); | 722 | fscache_stat(&fscache_n_store_pages); |
| 725 | fscache_stat(&fscache_n_store_pages); | 723 | fscache_stat(&fscache_n_cop_write_page); |
| 726 | fscache_stat(&fscache_n_cop_write_page); | 724 | ret = object->cache->ops->write_page(op, page); |
| 727 | ret = object->cache->ops->write_page(op, page); | 725 | fscache_stat_d(&fscache_n_cop_write_page); |
| 728 | fscache_stat_d(&fscache_n_cop_write_page); | 726 | fscache_set_op_state(&op->op, "EndWrite"); |
| 729 | fscache_set_op_state(&op->op, "EndWrite"); | 727 | fscache_end_page_write(object, page); |
| 730 | fscache_end_page_write(object, page); | 728 | if (ret < 0) { |
| 731 | if (ret < 0) { | 729 | fscache_set_op_state(&op->op, "Abort"); |
| 732 | fscache_set_op_state(&op->op, "Abort"); | 730 | fscache_abort_object(object); |
| 733 | fscache_abort_object(object); | 731 | } else { |
| 734 | } else { | 732 | fscache_enqueue_operation(&op->op); |
| 735 | fscache_enqueue_operation(&op->op); | ||
| 736 | } | ||
| 737 | } | 733 | } |
| 738 | 734 | ||
| 739 | _leave(""); | 735 | _leave(""); |
