Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-cache-policy-cleaner.c

diff --git a/drivers/md/dm-cache-policy-cleaner.c b/drivers/md/dm-cache-policy-cleaner.c
index b04d1f904d0763c43870e38c857fcd25baad4b7e..240c9f0e85e74e864624f0cb972c5b4394eaf11f 100644 (file)
--- a/drivers/md/dm-cache-policy-cleaner.c
+++ b/drivers/md/dm-cache-policy-cleaner.c
@@ -171,7 +171,8 @@ static void remove_cache_hash_entry(struct wb_cache_entry *e)
 /* Public interface (see dm-cache-policy.h */
 static int wb_map(struct dm_cache_policy *pe, dm_oblock_t oblock,
                  bool can_block, bool can_migrate, bool discarded_oblock,
-                 struct bio *bio, struct policy_result *result)
+                 struct bio *bio, struct policy_locker *locker,
+                 struct policy_result *result)
 {
        struct policy *p = to_policy(pe);
        struct wb_cache_entry *e;
@@ -358,7 +359,8 @@ static struct wb_cache_entry *get_next_dirty_entry(struct policy *p)
 
 static int wb_writeback_work(struct dm_cache_policy *pe,
                             dm_oblock_t *oblock,
-                            dm_cblock_t *cblock)
+                            dm_cblock_t *cblock,
+                            bool critical_only)
 {
        int r = -ENOENT;
        struct policy *p = to_policy(pe);