ext4_bcache: manipulate buffer refctr by two helpers

[lwext4.git] / lwext4 / ext4_bcache.c

diff --git a/lwext4/ext4_bcache.c b/lwext4/ext4_bcache.c
index 00be89854bf73d13c3cdff5e32a43bbaf12537e1..ab19c177c619a66dc45c48e4da572a8d5eb866ac 100644 (file)
--- a/lwext4/ext4_bcache.c
+++ b/lwext4/ext4_bcache.c
@@ -36,6 +36,7 @@
 
 #include "ext4_config.h"
 #include "ext4_bcache.h"
+#include "ext4_blockdev.h"
 #include "ext4_debug.h"
 #include "ext4_errno.h"
 
@@ -156,10 +157,7 @@ void ext4_bcache_drop_buf(struct ext4_bcache *bc, struct ext4_buf *buf)
 
        /*Forcibly drop dirty buffer.*/
        if (ext4_bcache_test_flag(buf, BC_DIRTY))
-               SLIST_REMOVE(&bc->dirty_list,
-                            buf,
-                            ext4_buf,
-                            dirty_node);
+               ext4_bcache_remove_dirty_node(bc, buf);
 
        ext4_buf_free(buf);
        bc->ref_blocks--;
@@ -178,19 +176,12 @@ int ext4_bcache_alloc(struct ext4_bcache *bc, struct ext4_block *b,
                        buf->lru_id = ++bc->lru_ctr;
                        RB_REMOVE(ext4_buf_lru, &bc->lru_root, buf);
                        if (ext4_bcache_test_flag(buf, BC_DIRTY))
-                               SLIST_REMOVE(&bc->dirty_list,
-                                            buf,
-                                            ext4_buf,
-                                            dirty_node);
+                               ext4_bcache_remove_dirty_node(bc, buf);
 
                }
 
-               buf->refctr++;
+               ext4_bcache_inc_ref(buf);
 
-               b->uptodate = ext4_bcache_test_flag(buf, BC_UPTODATE);
-               /* Right now we don't propagate the dirty flag from ext4_buf to
-                * ext4_block. */
-               b->dirty = false;
                b->buf = buf;
                b->data = buf->data;
 
@@ -207,13 +198,11 @@ int ext4_bcache_alloc(struct ext4_bcache *bc, struct ext4_block *b,
        /* One more buffer in bcache now. :-) */
        bc->ref_blocks++;
 
-       buf->refctr = 1;
+       ext4_bcache_inc_ref(buf);
        /* Assign new value to LRU id and increment LRU counter
         * by 1*/
        buf->lru_id = ++bc->lru_ctr;
 
-       b->uptodate = false;
-       b->dirty = false;
        b->buf = buf;
        b->data = buf->data;
 
@@ -237,26 +226,18 @@ int ext4_bcache_free(struct ext4_bcache *bc, struct ext4_block *b)
        ext4_assert(buf->refctr);
 
        /*Just decrease reference counter*/
-       buf->refctr--;
-
-       /* If buffer is modified, buf will be mark up-to-date and dirty. */
-       if (b->dirty) {
-               ext4_bcache_set_flag(buf, BC_DIRTY);
-               ext4_bcache_set_flag(buf, BC_UPTODATE);
-               b->uptodate = true;
-       }
-       /* Someone might want to drop this buffer from bcache. */
-       if (!b->uptodate) {
-               ext4_bcache_clear_flag(buf, BC_DIRTY);
-               ext4_bcache_clear_flag(buf, BC_UPTODATE);
-       }
+       ext4_bcache_dec_ref(buf);
 
        /* We are the last one touching this buffer, do the cleanups. */
        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))
-                       SLIST_INSERT_HEAD(&bc->dirty_list, buf, dirty_node);
+               if (ext4_bcache_test_flag(buf, BC_DIRTY)) {
+                       if (bc->bdev->cache_write_back)
+                               ext4_bcache_insert_dirty_node(bc, buf);
+                       else
+                               ext4_block_flush_buf(bc->bdev, buf);
+               }
 
                /* The buffer is invalidated...drop it. */
                if (!ext4_bcache_test_flag(buf, BC_UPTODATE))
@@ -266,8 +247,6 @@ int ext4_bcache_free(struct ext4_bcache *bc, struct ext4_block *b)
 
        b->lb_id = 0;
        b->data = 0;
-       b->uptodate = false;
-       b->dirty = false;
 
        return EOK;
 }