Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 336b7e1f authored by Mike Snitzer's avatar Mike Snitzer Committed by Jens Axboe
Browse files

block: remove export for blk_queue_bio 



With commit ff36ab34 ("dm: remove request-based logic from
make_request_fn wrapper") DM no longer calls blk_queue_bio() directly,
so remove its export.  Doing so required a forward declaration in
blk-core.c.

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4cfceaf0

block/blk-core.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -734,6 +734,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) 
}

}

EXPORT_SYMBOL(blk_init_queue_node);

EXPORT_SYMBOL(blk_init_queue_node);





static void blk_queue_bio(struct request_queue *q, struct bio *bio);



struct request_queue *

struct request_queue *

blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,

blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,

			 spinlock_t *lock)

			 spinlock_t *lock)
@@ -1578,7 +1580,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) 
	blk_rq_bio_prep(req->q, req, bio);

	blk_rq_bio_prep(req->q, req, bio);

}

}





void blk_queue_bio(struct request_queue *q, struct bio *bio)

static void blk_queue_bio(struct request_queue *q, struct bio *bio)

{

{

	const bool sync = !!(bio->bi_rw & REQ_SYNC);

	const bool sync = !!(bio->bi_rw & REQ_SYNC);

	struct blk_plug *plug;

	struct blk_plug *plug;
@@ -1686,7 +1688,6 @@ void blk_queue_bio(struct request_queue *q, struct bio *bio) 
		spin_unlock_irq(q->queue_lock);

		spin_unlock_irq(q->queue_lock);

	}

	}

}

}

EXPORT_SYMBOL_GPL(blk_queue_bio);	/* for device mapper only */





/*

/*

 * If bio->bi_dev is a partition, remap the location

 * If bio->bi_dev is a partition, remap the location

include/linux/blkdev.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -821,8 +821,6 @@ extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t, 
extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,

extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,

			 struct scsi_ioctl_command __user *);

			 struct scsi_ioctl_command __user *);





extern void blk_queue_bio(struct request_queue *q, struct bio *bio);



/*

/*

 * A queue has just exitted congestion.  Note this in the global counter of

 * A queue has just exitted congestion.  Note this in the global counter of

 * congested queues, and wake up anyone who was waiting for requests to be

 * congested queues, and wake up anyone who was waiting for requests to be