Merge branch 'for-3.6/core' of git://git.kernel.dk/linux-block

Pull core block IO bits from Jens Axboe:
 "The most complicated part if this is the request allocation rework by
  Tejun, which has been queued up for a long time and has been in
  for-next ditto as well.

  There are a few commits from yesterday and today, mostly trivial and
  obvious fixes.  So I'm pretty confident that it is sound.  It's also
  smaller than usual."

* 'for-3.6/core' of git://git.kernel.dk/linux-block:
  block: remove dead func declaration
  block: add partition resize function to blkpg ioctl
  block: uninitialized ioc->nr_tasks triggers WARN_ON
  block: do not artificially constrain max_sectors for stacking drivers
  blkcg: implement per-blkg request allocation
  block: prepare for multiple request_lists
  block: add q->nr_rqs[] and move q->rq.elvpriv to q->nr_rqs_elvpriv
  blkcg: inline bio_blkcg() and friends
  block: allocate io_context upfront
  block: refactor get_request[_wait]()
  block: drop custom queue draining used by scsi_transport_{iscsi|fc}
  mempool: add @gfp_mask to mempool_create_node()
  blkcg: make root blkcg allocation use %GFP_KERNEL
  blkcg: __blkg_lookup_create() doesn't need radix preload

2 files changed, 1 insertions, 39 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 2d1e68db9b3f..e894ca7b54c0 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -4146,45 +4146,7 @@ fc_bsg_rportadd(struct Scsi_Host *shost, struct fc_rport *rport)
 static void
 fc_bsg_remove(struct request_queue *q)
 {
-        struct request *req; /* block request */
-        int counts; /* totals for request_list count and starved */
-
         if (q) {
-                /* Stop taking in new requests */
-                spin_lock_irq(q->queue_lock);
-                blk_stop_queue(q);
-
-                /* drain all requests in the queue */
-                while (1) {
-                        /* need the lock to fetch a request
-                         * this may fetch the same reqeust as the previous pass
-                         */
-                        req = blk_fetch_request(q);
-                        /* save requests in use and starved */
-                        counts = q->rq.count[0] + q->rq.count[1] +
-                                q->rq.starved[0] + q->rq.starved[1];
-                        spin_unlock_irq(q->queue_lock);
-                        /* any requests still outstanding? */
-                        if (counts == 0)
-                                break;
-
-                        /* This may be the same req as the previous iteration,
-                         * always send the blk_end_request_all after a prefetch.
-                         * It is not okay to not end the request because the
-                         * prefetch started the request.
-                         */
-                        if (req) {
-                                /* return -ENXIO to indicate that this queue is
-                                 * going away
-                                 */
-                                req->errors = -ENXIO;
-                                blk_end_request_all(req, -ENXIO);
-                        }
-
-                        msleep(200); /* allow bsg to possibly finish */
-                        spin_lock_irq(q->queue_lock);
-                }
-
                 bsg_unregister_queue(q);
                 blk_cleanup_queue(q);
         }
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 09809d06eccb..fa1dfaa83e32 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -575,7 +575,7 @@ static int iscsi_remove_host(struct transport_container *tc,
         struct iscsi_cls_host *ihost = shost->shost_data;
 
         if (ihost->bsg_q) {
-                bsg_remove_queue(ihost->bsg_q);
+                bsg_unregister_queue(ihost->bsg_q);
                 blk_cleanup_queue(ihost->bsg_q);
         }
         return 0;