ext4_bcache: remove buffer from LRU tree when it will be dropped.

[lwext4.git] / lwext4 / ext4_bcache.c

diff --git a/lwext4/ext4_bcache.c b/lwext4/ext4_bcache.c
index ab19c177c619a66dc45c48e4da572a8d5eb866ac..628735ab659fe38b5aac1e7fda1f660210f6fafb 100644 (file)
--- a/lwext4/ext4_bcache.c
+++ b/lwext4/ext4_bcache.c
@@ -81,6 +81,15 @@ int ext4_bcache_init_dynamic(struct ext4_bcache *bc, uint32_t cnt,
        return EOK;
 }
 
+void ext4_bcache_cleanup(struct ext4_bcache *bc)
+{
+       struct ext4_buf *buf, *tmp;
+       RB_FOREACH_SAFE(buf, ext4_buf_lba, &bc->lba_root, tmp) {
+               ext4_block_flush_buf(bc->bdev, buf);
+               ext4_bcache_drop_buf(bc, buf);
+       }
+}
+
 int ext4_bcache_fini_dynamic(struct ext4_bcache *bc)
 {
        memset(bc, 0, sizeof(struct ext4_bcache));
@@ -149,11 +158,15 @@ struct ext4_buf *ext4_buf_lowest_lru(struct ext4_bcache *bc)
 
 void ext4_bcache_drop_buf(struct ext4_bcache *bc, struct ext4_buf *buf)
 {
-       /*Cannot drop any referenced buffers.*/
-       ext4_assert(!buf->refctr);
+       /* Warn on dropping any referenced buffers.*/
+       if (buf->refctr) {
+               ext4_dbg(DEBUG_BCACHE, DBG_WARN "Buffer is still referenced. "
+                               "lba: %" PRIu64 ", refctr: %" PRIu32 "\n",
+                               buf->lba, buf->refctr);
+       } else
+               RB_REMOVE(ext4_buf_lru, &bc->lru_root, buf);
 
        RB_REMOVE(ext4_buf_lba, &bc->lba_root, buf);
-       RB_REMOVE(ext4_buf_lru, &bc->lru_root, buf);
 
        /*Forcibly drop dirty buffer.*/
        if (ext4_bcache_test_flag(buf, BC_DIRTY))
@@ -163,11 +176,29 @@ void ext4_bcache_drop_buf(struct ext4_bcache *bc, struct ext4_buf *buf)
        bc->ref_blocks--;
 }
 
-int ext4_bcache_alloc(struct ext4_bcache *bc, struct ext4_block *b,
-                     bool *is_new)
+void ext4_bcache_invalidate_lba(struct ext4_bcache *bc,
+                               uint64_t from,
+                               uint32_t cnt)
 {
-       /* Try to search the buffer with exaxt LBA. */
-       struct ext4_buf *buf = ext4_buf_lookup(bc, b->lb_id);
+       uint64_t end = from + cnt - 1;
+       struct ext4_buf *tmp = ext4_buf_lookup(bc, from), *buf;
+       RB_FOREACH_FROM(buf, ext4_buf_lba, tmp) {
+               if (buf->lba > end)
+                       break;
+
+               /* Clear both dirty and up-to-date flags. */
+               if (ext4_bcache_test_flag(buf, BC_DIRTY))
+                       ext4_bcache_remove_dirty_node(bc, buf);
+
+               ext4_bcache_clear_dirty(buf);
+       }
+}
+
+struct ext4_buf *
+ext4_bcache_find_get(struct ext4_bcache *bc, struct ext4_block *b,
+                    uint64_t lba)
+{
+       struct ext4_buf *buf = ext4_buf_lookup(bc, lba);
        if (buf) {
                /* If buffer is not referenced. */
                if (!buf->refctr) {
@@ -184,7 +215,16 @@ int ext4_bcache_alloc(struct ext4_bcache *bc, struct ext4_block *b,
 
                b->buf = buf;
                b->data = buf->data;
+       }
+       return buf;
+}
 
+int ext4_bcache_alloc(struct ext4_bcache *bc, struct ext4_block *b,
+                     bool *is_new)
+{
+       /* Try to search the buffer with exaxt LBA. */
+       struct ext4_buf *buf = ext4_bcache_find_get(bc, b, b->lb_id);
+       if (buf) {
                *is_new = false;
                return EOK;
        }
@@ -232,11 +272,15 @@ int ext4_bcache_free(struct ext4_bcache *bc, struct ext4_block *b)
        if (!buf->refctr) {
                RB_INSERT(ext4_buf_lru, &bc->lru_root, buf);
                /* This buffer is ready to be flushed. */
-               if (ext4_bcache_test_flag(buf, BC_DIRTY)) {
-                       if (bc->bdev->cache_write_back)
+               if (ext4_bcache_test_flag(buf, BC_DIRTY) &&
+                   ext4_bcache_test_flag(buf, BC_UPTODATE)) {
+                       if (bc->bdev->cache_write_back &&
+                           !ext4_bcache_test_flag(buf, BC_FLUSH))
                                ext4_bcache_insert_dirty_node(bc, buf);
-                       else
+                       else {
                                ext4_block_flush_buf(bc->bdev, buf);
+                               ext4_bcache_clear_flag(buf, BC_FLUSH);
+                       }
                }
 
                /* The buffer is invalidated...drop it. */
@@ -256,6 +300,7 @@ bool ext4_bcache_is_full(struct ext4_bcache *bc)
        return (bc->cnt <= bc->ref_blocks);
 }
 
+
 /**
  * @}
  */