aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorFUJITA Tomonori <tomof@acm.org>2007-07-21 21:06:50 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-22 09:48:41 -0400
commit41e1703b9b88cf9b5e91cdd2f7dcded3ec3917cb (patch)
treea5bc5c4b61bfe3705758881d833f154b30695e14 /block
parentdf468820b6881fc14e50f6b2fcffd3e945417d68 (diff)
[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>
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index a26ba07955fe..7bfebd574e55 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -214,8 +214,8 @@ int blk_verify_command(unsigned char *cmd, int has_write_perm)
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,
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. handles 243 * 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,
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)