Revert "Merge remote-tracking branch 'msm-4.4/tmp-510d0a3f' into msm-4.4"

This reverts commit 9d6fd2c3e9fcfb ("Merge remote-tracking branch
'msm-4.4/tmp-510d0a3f' into msm-4.4"), because it breaks the
dump parsing tools due to kernel can be loaded anywhere in the memory
now and not fixed at linear mapping.

Change-Id: Id416f0a249d803442847d09ac47781147b0d0ee6
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>

2 files changed, 24 insertions, 42 deletions

diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c
index 3970cda10080..27f2ef300f8b 100644
--- a/drivers/md/dm-cache-metadata.c
+++ b/drivers/md/dm-cache-metadata.c
@@ -867,55 +867,39 @@ static int blocks_are_unmapped_or_clean(struct dm_cache_metadata *cmd,
 	return 0;
 }
 
-static bool cmd_write_lock(struct dm_cache_metadata *cmd)
-{
-	down_write(&cmd->root_lock);
-	if (cmd->fail_io || dm_bm_is_read_only(cmd->bm)) {
-		up_write(&cmd->root_lock);
-		return false;
+#define WRITE_LOCK(cmd)	\
+	down_write(&cmd->root_lock); \
+	if (cmd->fail_io || dm_bm_is_read_only(cmd->bm)) { \
+		up_write(&cmd->root_lock); \
+		return -EINVAL; \
 	}
-	return true;
-}
-
-#define WRITE_LOCK(cmd)				\
-	do {					\
-		if (!cmd_write_lock((cmd)))	\
-			return -EINVAL;		\
-	} while(0)
 
-#define WRITE_LOCK_VOID(cmd)			\
-	do {					\
-		if (!cmd_write_lock((cmd)))	\
-			return;			\
-	} while(0)
+#define WRITE_LOCK_VOID(cmd) \
+	down_write(&cmd->root_lock); \
+	if (cmd->fail_io || dm_bm_is_read_only(cmd->bm)) { \
+		up_write(&cmd->root_lock); \
+		return; \
+	}
 
 #define WRITE_UNLOCK(cmd) \
-	up_write(&(cmd)->root_lock)
+	up_write(&cmd->root_lock)
 
-static bool cmd_read_lock(struct dm_cache_metadata *cmd)
-{
-	down_read(&cmd->root_lock);
-	if (cmd->fail_io) {
-		up_read(&cmd->root_lock);
-		return false;
+#define READ_LOCK(cmd) \
+	down_read(&cmd->root_lock); \
+	if (cmd->fail_io || dm_bm_is_read_only(cmd->bm)) { \
+		up_read(&cmd->root_lock); \
+		return -EINVAL; \
 	}
-	return true;
-}
-
-#define READ_LOCK(cmd)				\
-	do {					\
-		if (!cmd_read_lock((cmd)))	\
-			return -EINVAL;		\
-	} while(0)
 
-#define READ_LOCK_VOID(cmd)			\
-	do {					\
-		if (!cmd_read_lock((cmd)))	\
-			return;			\
-	} while(0)
+#define READ_LOCK_VOID(cmd)	\
+	down_read(&cmd->root_lock); \
+	if (cmd->fail_io || dm_bm_is_read_only(cmd->bm)) { \
+		up_read(&cmd->root_lock); \
+		return; \
+	}
 
 #define READ_UNLOCK(cmd) \
-	up_read(&(cmd)->root_lock)
+	up_read(&cmd->root_lock)
 
 int dm_cache_resize(struct dm_cache_metadata *cmd, dm_cblock_t new_cache_size)
 {
diff --git a/drivers/md/md.c b/drivers/md/md.c
index c57fdf847b47..b1e1f6b95782 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -293,8 +293,6 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
 	 * go away inside make_request
 	 */
 	sectors = bio_sectors(bio);
-	/* bio could be mergeable after passing to underlayer */
-	bio->bi_rw &= ~REQ_NOMERGE;
 	mddev->pers->make_request(mddev, bio);
 
 	cpu = part_stat_lock();