From d5da625ac44495db06077289295b7b6c3889cda8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Apr 2022 13:42:02 +0200 Subject: [PATCH] ANDROID: dm-user: remove REQ_OP_WRITE_SAME As of commit 73bd66d9c834 ("scsi: block: Remove REQ_OP_WRITE_SAME support"), REQ_OP_WRITE_SAME is no longer present, so remove it from the dm-user driver to fix the build as it is no longer needed. Fixes: 73bd66d9c834 ("scsi: block: Remove REQ_OP_WRITE_SAME support") Signed-off-by: Greg Kroah-Hartman Change-Id: I6cdcea507c55d23ef090f8b96e0e90c5c1f0e09f --- drivers/md/dm-user.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/md/dm-user.c b/drivers/md/dm-user.c index 2ff224b0cd3f..f29673ccc00b 100644 --- a/drivers/md/dm-user.c +++ b/drivers/md/dm-user.c @@ -313,7 +313,6 @@ static inline size_t bio_bytes_needed_to_user(struct bio *bio) case REQ_OP_FLUSH: case REQ_OP_DISCARD: case REQ_OP_SECURE_ERASE: - case REQ_OP_WRITE_SAME: case REQ_OP_WRITE_ZEROES: return sizeof(struct dm_user_message); @@ -335,7 +334,6 @@ static inline size_t bio_bytes_needed_from_user(struct bio *bio) case REQ_OP_FLUSH: case REQ_OP_DISCARD: case REQ_OP_SECURE_ERASE: - case REQ_OP_WRITE_SAME: case REQ_OP_WRITE_ZEROES: return sizeof(struct dm_user_message); @@ -361,8 +359,6 @@ static inline long bio_type_to_user_type(struct bio *bio) return DM_USER_REQ_MAP_DISCARD; case REQ_OP_SECURE_ERASE: return DM_USER_REQ_MAP_SECURE_ERASE; - case REQ_OP_WRITE_SAME: - return DM_USER_REQ_MAP_WRITE_SAME; case REQ_OP_WRITE_ZEROES: return DM_USER_REQ_MAP_WRITE_ZEROES;