History

[SCSI] bsg: unexport sg v3 helper functions

blk_fill_sghdr_rq, blk_unmap_sghdr_rq, and blk_complete_sghdr_rq were exported for bsg, however bsg was changed to support only sg v4.

FUJITA Tomonori committed 19 years ago

Commit 41e17031 parent df468822 files · +5 −13Browse files

Unified · Split

2 files
  1. block/scsi_ioctl.c +5 −8
  2. include/linux/blkdev.h +0 −5
block/scsi_ioctl.c+5−8
@@ -214,8 +214,8 @@ int blk_verify_command(unsigned char *cmd, int has_write_perm) · 213 unmodified lines
214}214}
215EXPORT_SYMBOL_GPL(blk_verify_command);215EXPORT_SYMBOL_GPL(blk_verify_command);
216 216
217int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq,217static int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq,
218 struct sg_io_hdr *hdr, int has_write_perm)218 struct sg_io_hdr *hdr, int has_write_perm)
219{219{
220 memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */220 memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
221 221
@@ -238,22 +238,20 @@ int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq, · 16 unmodified lines
238 238
239 return 0;239 return 0;
240}240}
241EXPORT_SYMBOL_GPL(blk_fill_sghdr_rq);
242 241
243/*242/*
244 * unmap a request that was previously mapped to this sg_io_hdr. handles243 * unmap a request that was previously mapped to this sg_io_hdr. handles
245 * both sg and non-sg sg_io_hdr.244 * both sg and non-sg sg_io_hdr.
246 */245 */
247int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr)246static int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr)
248{247{
249 blk_rq_unmap_user(rq->bio);248 blk_rq_unmap_user(rq->bio);
250 blk_put_request(rq);249 blk_put_request(rq);
251 return 0;250 return 0;
252}251}
253EXPORT_SYMBOL_GPL(blk_unmap_sghdr_rq);
254 252
255int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,253static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
256 struct bio *bio)254 struct bio *bio)
257{255{
258 int r, ret = 0;256 int r, ret = 0;
259 257
@@ -287,7 +285,6 @@ int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, · 27 unmodified lines
287 285
288 return r;286 return r;
289}287}
290EXPORT_SYMBOL_GPL(blk_complete_sghdr_rq);
291 288
292static int sg_io(struct file *file, request_queue_t *q,289static int sg_io(struct file *file, request_queue_t *q,
293 struct gendisk *bd_disk, struct sg_io_hdr *hdr)290 struct gendisk *bd_disk, struct sg_io_hdr *hdr)
include/linux/blkdev.h+0−5
@@ -698,11 +698,6 @@ extern int blk_execute_rq(request_queue_t *, struct gendisk *, · 697 unmodified lines
698 struct request *, int);698 struct request *, int);
699extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,699extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,
700 struct request *, int, rq_end_io_fn *);700 struct request *, int, rq_end_io_fn *);
701extern int blk_fill_sghdr_rq(request_queue_t *, struct request *,
702 struct sg_io_hdr *, int);
703extern int blk_unmap_sghdr_rq(struct request *, struct sg_io_hdr *);
704extern int blk_complete_sghdr_rq(struct request *, struct sg_io_hdr *,
705 struct bio *);
706extern int blk_verify_command(unsigned char *, int);701extern int blk_verify_command(unsigned char *, int);
707 702
708static inline request_queue_t *bdev_get_queue(struct block_device *bdev)703static inline request_queue_t *bdev_get_queue(struct block_device *bdev)