23 files changed, 467 insertions, 131 deletions

diff --git a/block/bio.c b/block/bio.c
index 8281bfcbc265..4db1008309ed 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -2097,8 +2097,12 @@ EXPORT_SYMBOL_GPL(bio_associate_blkg);
  */
 void bio_clone_blkg_association(struct bio *dst, struct bio *src)
 {
+        rcu_read_lock();
+
         if (src->bi_blkg)
                 __bio_associate_blkg(dst, src->bi_blkg);
+
+        rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(bio_clone_blkg_association);
 #endif /* CONFIG_BLK_CGROUP */
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index c8cc1cbb6370..2bed5725aa03 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -438,29 +438,6 @@ static void blkg_destroy_all(struct request_queue *q)
         spin_unlock_irq(&q->queue_lock);
 }
 
-/*
- * A group is RCU protected, but having an rcu lock does not mean that one
- * can access all the fields of blkg and assume these are valid.  For
- * example, don't try to follow throtl_data and request queue links.
- *
- * Having a reference to blkg under an rcu allows accesses to only values
- * local to groups like group stats and group rate limits.
- */
-void __blkg_release_rcu(struct rcu_head *rcu_head)
-{
-        struct blkcg_gq *blkg = container_of(rcu_head, struct blkcg_gq, rcu_head);
-
-        /* release the blkcg and parent blkg refs this blkg has been holding */
-        css_put(&blkg->blkcg->css);
-        if (blkg->parent)
-                blkg_put(blkg->parent);
-
-        wb_congested_put(blkg->wb_congested);
-
-        blkg_free(blkg);
-}
-EXPORT_SYMBOL_GPL(__blkg_release_rcu);
-
 static int blkcg_reset_stats(struct cgroup_subsys_state *css,
                              struct cftype *cftype, u64 val)
 {
diff --git a/block/bsg.c b/block/bsg.c
index 44f6028b9567..50e5f8f666f2 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -177,6 +177,10 @@ bsg_map_hdr(struct request_queue *q, struct sg_io_v4 *hdr, fmode_t mode)
                         goto out;
                 }
 
+                pr_warn_once(
+                        "BIDI support in bsg has been deprecated and might be removed. "
+                        "Please report your use case to linux-scsi@vger.kernel.org\n");
+
                 next_rq = blk_get_request(q, REQ_OP_SCSI_IN, 0);
                 if (IS_ERR(next_rq)) {
                         ret = PTR_ERR(next_rq);
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index bf996bd44cfc..0903e0803ec8 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1601,8 +1601,6 @@ static int fd_locked_ioctl(struct block_device *bdev, fmode_t mode,
                         return p->type->read_size;
 #endif
         default:
-                printk(KERN_DEBUG "fd_ioctl: unknown cmd %d for drive %d.",
-                       cmd, drive);
                 return -ENOSYS;
         }
         return 0;
diff --git a/drivers/block/drbd/drbd_debugfs.c b/drivers/block/drbd/drbd_debugfs.c
index 5d5e8d6a8a56..f13b48ff5f43 100644
--- a/drivers/block/drbd/drbd_debugfs.c
+++ b/drivers/block/drbd/drbd_debugfs.c
@@ -237,6 +237,8 @@ static void seq_print_peer_request_flags(struct seq_file *m, struct drbd_peer_re
         seq_print_rq_state_bit(m, f & EE_CALL_AL_COMPLETE_IO, &sep, "in-AL");
         seq_print_rq_state_bit(m, f & EE_SEND_WRITE_ACK, &sep, "C");
         seq_print_rq_state_bit(m, f & EE_MAY_SET_IN_SYNC, &sep, "set-in-sync");
+        seq_print_rq_state_bit(m, f & EE_TRIM, &sep, "trim");
+        seq_print_rq_state_bit(m, f & EE_ZEROOUT, &sep, "zero-out");
         seq_print_rq_state_bit(m, f & EE_WRITE_SAME, &sep, "write-same");
         seq_putc(m, '\n');
 }
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 1e47db57b9d2..000a2f4c0e92 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -430,7 +430,11 @@ enum {
         __EE_MAY_SET_IN_SYNC,
 
         /* is this a TRIM aka REQ_OP_DISCARD? */
-        __EE_IS_TRIM,
+        __EE_TRIM,
+        /* explicit zero-out requested, or
+         * our lower level cannot handle trim,
+         * and we want to fall back to zeroout instead */
+        __EE_ZEROOUT,
 
         /* In case a barrier failed,
          * we need to resubmit without the barrier flag. */
@@ -472,7 +476,8 @@ enum {
 };
 #define EE_CALL_AL_COMPLETE_IO (1<<__EE_CALL_AL_COMPLETE_IO)
 #define EE_MAY_SET_IN_SYNC     (1<<__EE_MAY_SET_IN_SYNC)
-#define EE_IS_TRIM             (1<<__EE_IS_TRIM)
+#define EE_TRIM                (1<<__EE_TRIM)
+#define EE_ZEROOUT             (1<<__EE_ZEROOUT)
 #define EE_RESUBMITTED         (1<<__EE_RESUBMITTED)
 #define EE_WAS_ERROR           (1<<__EE_WAS_ERROR)
 #define EE_HAS_DIGEST          (1<<__EE_HAS_DIGEST)
@@ -1556,6 +1561,8 @@ extern void start_resync_timer_fn(struct timer_list *t);
 extern void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req);
 
 /* drbd_receiver.c */
+extern int drbd_issue_discard_or_zero_out(struct drbd_device *device,
+                sector_t start, unsigned int nr_sectors, int flags);
 extern int drbd_receiver(struct drbd_thread *thi);
 extern int drbd_ack_receiver(struct drbd_thread *thi);
 extern void drbd_send_ping_wf(struct work_struct *ws);
@@ -1609,13 +1616,7 @@ static inline void drbd_tcp_quickack(struct socket *sock)
 }
 
 /* sets the number of 512 byte sectors of our virtual device */
-static inline void drbd_set_my_capacity(struct drbd_device *device,
-                                        sector_t size)
-{
-        /* set_capacity(device->this_bdev->bd_disk, size); */
-        set_capacity(device->vdisk, size);
-        device->this_bdev->bd_inode->i_size = (loff_t)size << 9;
-}
+void drbd_set_my_capacity(struct drbd_device *device, sector_t size);
 
 /*
  * used to submit our private bio
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index f973a2a845c8..714eb64fabfd 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -1668,7 +1668,11 @@ static u32 bio_flags_to_wire(struct drbd_connection *connection,
                         (bio->bi_opf & REQ_PREFLUSH ? DP_FLUSH : 0) |
                         (bio_op(bio) == REQ_OP_WRITE_SAME ? DP_WSAME : 0) |
                         (bio_op(bio) == REQ_OP_DISCARD ? DP_DISCARD : 0) |
-                        (bio_op(bio) == REQ_OP_WRITE_ZEROES ? DP_DISCARD : 0);
+                        (bio_op(bio) == REQ_OP_WRITE_ZEROES ?
+                          ((connection->agreed_features & DRBD_FF_WZEROES) ?
+                           (DP_ZEROES |(!(bio->bi_opf & REQ_NOUNMAP) ? DP_DISCARD : 0))
+                           : DP_DISCARD)
+                        : 0);
         else
                 return bio->bi_opf & REQ_SYNC ? DP_RW_SYNC : 0;
 }
@@ -1712,10 +1716,11 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
         }
         p->dp_flags = cpu_to_be32(dp_flags);