xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dm cache policy mq: a few small fixes

Browse Source 
Rename takeout_queue to concat_queue.

Fix a harmless bug in mq policies pop() function.  Currently pop()
always succeeds, with up coming changes this wont be the case.

Fix typo in comment above pre_cache_to_cache prototype.

Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Joe Thornber
2013-10-24 14:10:28 -04:00
committed by Mike Snitzer
parent 3351937e4a
commit 0184b44e32
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/md/dm-cache-policy-mq.c
View File

@@ -311,7 +311,7 @@ struct mq_policy {
/*----------------------------------------------------------------*/ /*----------------------------------------------------------------*/
/* Free/alloc mq cache entry structures. */ /* Free/alloc mq cache entry structures. */
static void takeout_queue(struct list_head *lh, struct queue *q) static void concat_queue(struct list_head *lh, struct queue *q)
{ {
unsigned level; unsigned level;
@@ -323,8 +323,8 @@ static void free_entries(struct mq_policy *mq)
{ {
struct entry *e, *tmp; struct entry *e, *tmp;
takeout_queue(&mq->free, &mq->pre_cache); concat_queue(&mq->free, &mq->pre_cache);
takeout_queue(&mq->free, &mq->cache); concat_queue(&mq->free, &mq->cache);
list_for_each_entry_safe(e, tmp, &mq->free, list) list_for_each_entry_safe(e, tmp, &mq->free, list)
kmem_cache_free(mq_entry_cache, e); kmem_cache_free(mq_entry_cache, e);
@@ -531,14 +531,16 @@ static void del(struct mq_policy *mq, struct entry *e)
*/ */
static struct entry *pop(struct mq_policy *mq, struct queue *q) static struct entry *pop(struct mq_policy *mq, struct queue *q)
{ {
struct entry *e = container_of(queue_pop(q), struct entry, list); struct entry *e;
struct list_head *h = queue_pop(q);
if (e) { if (!h)
hash_remove(e); return NULL;
if (e->in_cache) e = container_of(h, struct entry, list);
free_cblock(mq, e->cblock); hash_remove(e);
} if (e->in_cache)
free_cblock(mq, e->cblock);
return e; return e;
} }
@@ -697,7 +699,7 @@ static int cache_entry_found(struct mq_policy *mq,
} }
/* /*
* Moves and entry from the pre_cache to the cache. The main work is * Moves an entry from the pre_cache to the cache. The main work is
* finding which cache block to use. * finding which cache block to use.
*/ */
static int pre_cache_to_cache(struct mq_policy *mq, struct entry *e, static int pre_cache_to_cache(struct mq_policy *mq, struct entry *e,