An uncacheable READ should be served out of the cache when possible.

Summary:
Fix for another bug that got introduced during the mergeorama.
An uncacheable READ will end up evicting the cached block (cleaning
it first if necessary). This should not happen, we should always
try and serve the cached block on an uncacheable READ. But a READ
miss will go to disk.

This bug does not affect correctness, but it could adversely impact
cache hit rates.

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev:

Author: Mohan Srinivasan

src/flashcache_main.c

@@ -2049,8 +2049,13 @@ flashcache_map(struct dm_target *ti, struct bio *bio)
 		flashcache_pid_expiry_all_locked(dmc);
 	uncacheable = (unlikely(dmc->bypass_cache) ||
 		       (to_sector(bio->bi_size) != dmc->block_size) ||
-		       (bio_data_dir(bio) == WRITE && (dmc->cache_mode == FLASHCACHE_WRITE_AROUND)) || 
-		       flashcache_uncacheable(dmc, bio));
+		       /* 
+			* If the op is a READ, we serve it out of cache whenever possible, 
+			* regardless of cacheablity 
+			*/
+		       (bio_data_dir(bio) == WRITE && 
+			((dmc->cache_mode == FLASHCACHE_WRITE_AROUND) ||
+			 flashcache_uncacheable(dmc, bio))));
 	spin_unlock_irqrestore(&dmc->ioctl_lock, flags);
 	if (uncacheable) {
 		flashcache_setlocks_multiget(dmc, bio);