1 files changed, 12 insertions, 2 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 33eded00c5b1..3b080541098e 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1704,6 +1704,11 @@ generic_make_request_checks(struct bio *bio)
                 goto end_io;
         }
 
+        if (bio->bi_rw & REQ_WRITE_SAME && !bdev_write_same(bio->bi_bdev)) {
+                err = -EOPNOTSUPP;
+                goto end_io;
+        }
+
         /*
          * Various block parts want %current->io_context and lazy ioc
          * allocation ends up trading a lot of pain for a small amount of
@@ -1809,8 +1814,6 @@ EXPORT_SYMBOL(generic_make_request);
  */
 void submit_bio(int rw, struct bio *bio)
 {
-        int count = bio_sectors(bio);
-
         bio->bi_rw |= rw;
 
         /*
@@ -1818,6 +1821,13 @@ void submit_bio(int rw, struct bio *bio)
          * go through the normal accounting stuff before submission.
          */
         if (bio_has_data(bio)) {
+                unsigned int count;
+
+                if (unlikely(rw & REQ_WRITE_SAME))
+                        count = bdev_logical_block_size(bio->bi_bdev) >> 9;
+                else
+                        count = bio_sectors(bio);
+
                 if (rw & WRITE) {
                         count_vm_events(PGPGOUT, count);
                 } else {