FS-Cache: Don't delete pending pages from the page-store tracking tree

Don't delete pending pages from the page-store tracking tree, but rather send
them for another write as they've presumably been updated.

Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/fs/fscache/page.c b/fs/fscache/page.c
index 3ea8897bc21..022a5da8e13 100644
--- a/fs/fscache/page.c
+++ b/fs/fscache/page.c
@@ -57,8 +57,11 @@ static void fscache_end_page_write(struct fscache_object *object,
                 /* delete the page from the tree if it is now no longer
                  * pending */
                 spin_lock(&cookie->stores_lock);
-                fscache_stat(&fscache_n_store_radix_deletes);
-                xpage = radix_tree_delete(&cookie->stores, page->index);
+                if (!radix_tree_tag_get(&cookie->stores, page->index,
+                                        FSCACHE_COOKIE_PENDING_TAG)) {
+                        fscache_stat(&fscache_n_store_radix_deletes);
+                        xpage = radix_tree_delete(&cookie->stores, page->index);
+                }
                 spin_unlock(&cookie->stores_lock);
                 wake_up_bit(&cookie->flags, 0);
         }