summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Pestov <sp@daterainc.com>2015-01-31 17:47:09 -0800
committerKent Overstreet <kmo@daterainc.com>2015-02-12 23:43:37 -0800
commit119c111456d5899ba03daf5f3289e8e0d9555c56 (patch)
tree42df89f4ab8b178f7d17d3ee61ad6d9c522c9741
parent0d43a7e21e74c943e66d6ed5a8de254ac58b7a2c (diff)
bcache: rename journal_reclaim() to journal_next_bucket()
This more accurately describes what it is doing. Change-Id: I8c8228ebccef7e2d4dbbfd521a355974b05a396c
-rw-r--r--drivers/md/bcache/journal.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c
index a4bf4031698a..d9eded6a168a 100644
--- a/drivers/md/bcache/journal.c
+++ b/drivers/md/bcache/journal.c
@@ -399,7 +399,7 @@ bsearch:
if (ja->seq[i] > seq) {
seq = ja->seq[i];
/*
- * When journal_reclaim() goes to allocate for
+ * When journal_next_bucket() goes to allocate for
* the first time, it'll use the bucket after
* ja->cur_idx
*/
@@ -724,9 +724,9 @@ static void journal_entry_no_room(struct cache_set *c)
}
/**
- * journal_reclaim - make room in the journal
+ * journal_next_bucket - move on to the next journal bucket if possible
*/
-static void journal_reclaim(struct cache_set *c)
+static void journal_next_bucket(struct cache_set *c)
{
struct bkey_i_extent *e = bkey_i_to_extent(&c->journal.key);
struct bch_extent_ptr *ptr;
@@ -1019,7 +1019,7 @@ static void journal_write_locked(struct closure *cl)
/*
* Make a copy of the key we're writing to for check_mark_super, since
- * journal_reclaim will change it
+ * journal_next_bucket will change it
*/
bkey_copy(&tmp.k, &e->k);
@@ -1177,7 +1177,7 @@ static bool __journal_res_get(struct cache_set *c, struct journal_res *res,
}
/* Try to get a new journal bucket */
- journal_reclaim(c);
+ journal_next_bucket(c);
if (!journal_bucket_has_room(c)) {
/* Still no room, we have to wait */
@@ -1312,14 +1312,14 @@ static bool bch_journal_writing_to_device(struct cache *ca)
/*
* This asumes that ca has already been marked read-only so that
- * journal_reclaim won't pick buckets out of ca any more.
+ * journal_next_bucket won't pick buckets out of ca any more.
* Hence, if the journal is not currently pointing to ca, there
* will be no new writes to journal entries in ca after all the
* pending ones have been flushed to disk.
*
* If the journal is being written to ca, write a new record, and
- * journal_reclaim will notice that the device is no longer writeable
- * and pick a new set of devices to write to.
+ * journal_next_bucket will notice that the device is no longer
+ * writeable and pick a new set of devices to write to.
*/
int bch_journal_move(struct cache *ca)
@@ -1337,7 +1337,7 @@ int bch_journal_move(struct cache *ca)
* bch_journal_meta will write a record and we'll wait
* for the write to complete.
* Actually writing the journal (journal_write_locked)
- * will call journal_reclaim which notices that the
+ * will call journal_next_bucket which notices that the
* device is no longer writeable, and picks a new one.
*/
bch_journal_meta(c, &cl);