diff options
| author | David Howells <dhowells@redhat.com> | 2009-11-19 19:11:29 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2009-11-19 19:11:29 +0100 |
| commit | 285e728b0ac55b53a673114096168d6f74930167 (patch) | |
| tree | 725dbd61cc9a3fecd593163d9b2cb0a061315cbf | |
| parent | FS-Cache: Fix lock misorder in fscache_write_op() (diff) | |
| download | linux-285e728b0ac55b53a673114096168d6f74930167.tar.xz linux-285e728b0ac55b53a673114096168d6f74930167.zip | |
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>
| -rw-r--r-- | fs/fscache/page.c | 7 | ||||
| -rw-r--r-- | lib/radix-tree.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/fs/fscache/page.c b/fs/fscache/page.c index 3ea8897bc217..022a5da8e130 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); } diff --git a/lib/radix-tree.c b/lib/radix-tree.c index ae6106855561..92cdd9936e3d 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -546,7 +546,6 @@ out: } EXPORT_SYMBOL(radix_tree_tag_clear); -#ifndef __KERNEL__ /* Only the test harness uses this at present */ /** * radix_tree_tag_get - get a tag on a radix tree node * @root: radix tree root @@ -609,7 +608,6 @@ int radix_tree_tag_get(struct radix_tree_root *root, } } EXPORT_SYMBOL(radix_tree_tag_get); -#endif /** * radix_tree_next_hole - find the next hole (not-present entry) |