2 files changed, 17 insertions, 10 deletions

diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index ebfa411d1a7d..3f6fd9d33ba3 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1242,17 +1242,8 @@ static int do_end_io(struct multipath *m, struct request *clone,
         if (!error && !clone->errors)
                 return 0;       /* I/O complete */
 
-        if (noretry_error(error)) {
-                if ((clone->cmd_flags & REQ_WRITE_SAME) &&
-                    !clone->q->limits.max_write_same_sectors) {
-                        struct queue_limits *limits;
-
-                        /* device doesn't really support WRITE SAME, disable it */
-                        limits = dm_get_queue_limits(dm_table_get_md(m->ti->table));
-                        limits->max_write_same_sectors = 0;
-                }
+        if (noretry_error(error))
                 return error;
-        }
 
         if (mpio->pgpath)
                 fail_path(mpio->pgpath);
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 97940fc8c302..3234a753a80d 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -755,6 +755,14 @@ static void dec_pending(struct dm_io *io, int error)
         }
 }
 
+static void disable_write_same(struct mapped_device *md)
+{
+        struct queue_limits *limits = dm_get_queue_limits(md);
+
+        /* device doesn't really support WRITE SAME, disable it */
+        limits->max_write_same_sectors = 0;
+}
+
 static void clone_endio(struct bio *bio, int error)
 {
         int r = 0;
@@ -783,6 +791,10 @@ static void clone_endio(struct bio *bio, int error)
                 }
         }
 
+        if (unlikely(r == -EREMOTEIO && (bio->bi_rw & REQ_WRITE_SAME) &&
+                     !bdev_get_queue(bio->bi_bdev)->limits.max_write_same_sectors))
+                disable_write_same(md);
+
         free_tio(md, tio);
         dec_pending(io, error);
 }
@@ -977,6 +989,10 @@ static void dm_done(struct request *clone, int error, bool mapped)
                         r = rq_end_io(tio->ti, clone, error, &tio->info);
         }
 
+        if (unlikely(r == -EREMOTEIO && (clone->cmd_flags & REQ_WRITE_SAME) &&
+                     !clone->q->limits.max_write_same_sectors))
+                disable_write_same(tio->md);
+
         if (r <= 0)
                 /* The target wants to complete the I/O */
                 dm_end_request(clone, r);