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.
Unified · Split
| @@ -214,8 +214,8 @@ int blk_verify_command(unsigned char *cmd, int has_write_perm) · 213 unmodified lines | ||
| 214 | 214 | } |
| 215 | 215 | EXPORT_SYMBOL_GPL(blk_verify_command); |
| 216 | 216 | |
| 217 | −int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq, | |
| 218 | − struct sg_io_hdr *hdr, int has_write_perm) | |
| 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 | 219 | { |
| 220 | 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 | 239 | return 0; |
| 240 | 240 | } |
| 241 | −EXPORT_SYMBOL_GPL(blk_fill_sghdr_rq); | |
| 242 | 241 | |
| 243 | 242 | /* |
| 244 | 243 | * unmap a request that was previously mapped to this sg_io_hdr. handles |
| 245 | 244 | * both sg and non-sg sg_io_hdr. |
| 246 | 245 | */ |
| 247 | −int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr) | |
| 246 | +static int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr) | |
| 248 | 247 | { |
| 249 | 248 | blk_rq_unmap_user(rq->bio); |
| 250 | 249 | blk_put_request(rq); |
| 251 | 250 | return 0; |
| 252 | 251 | } |
| 253 | −EXPORT_SYMBOL_GPL(blk_unmap_sghdr_rq); | |
| 254 | 252 | |
| 255 | −int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, | |
| 256 | − struct bio *bio) | |
| 253 | +static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, | |
| 254 | + struct bio *bio) | |
| 257 | 255 | { |
| 258 | 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 | 286 | return r; |
| 289 | 287 | } |
| 290 | −EXPORT_SYMBOL_GPL(blk_complete_sghdr_rq); | |
| 291 | 288 | |
| 292 | 289 | static int sg_io(struct file *file, request_queue_t *q, |
| 293 | 290 | struct gendisk *bd_disk, struct sg_io_hdr *hdr) |
| @@ -698,11 +698,6 @@ extern int blk_execute_rq(request_queue_t *, struct gendisk *, · 697 unmodified lines | ||
| 698 | 698 | struct request *, int); |
| 699 | 699 | extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *, |
| 700 | 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 | 701 | extern int blk_verify_command(unsigned char *, int); |
| 707 | 702 | |
| 708 | 703 | static inline request_queue_t *bdev_get_queue(struct block_device *bdev) |