[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.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

authored by FUJITA Tomonori and committed by James Bottomley 41e1703b df468820

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