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

Commit 41e1703b authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

[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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent df468820

block/scsi_ioctl.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ int blk_verify_command(unsigned char *cmd, int has_write_perm) 
}

}

EXPORT_SYMBOL_GPL(blk_verify_command);

EXPORT_SYMBOL_GPL(blk_verify_command);





int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq,

static int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq,

			     struct sg_io_hdr *hdr, int has_write_perm)

			     struct sg_io_hdr *hdr, int has_write_perm)

{

{

	memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */

	memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */
@@ -238,21 +238,19 @@ int blk_fill_sghdr_rq(request_queue_t *q, struct request *rq, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(blk_fill_sghdr_rq);





/*

/*

 * unmap a request that was previously mapped to this sg_io_hdr. handles

 * unmap a request that was previously mapped to this sg_io_hdr. handles

 * both sg and non-sg sg_io_hdr.

 * both sg and non-sg sg_io_hdr.

 */

 */

int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr)

static int blk_unmap_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr)

{

{

	blk_rq_unmap_user(rq->bio);

	blk_rq_unmap_user(rq->bio);

	blk_put_request(rq);

	blk_put_request(rq);

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(blk_unmap_sghdr_rq);





int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,

static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,

				 struct bio *bio)

				 struct bio *bio)

{

{

	int r, ret = 0;

	int r, ret = 0;
@@ -287,7 +285,6 @@ int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr, 




	return r;

	return r;

}

}

EXPORT_SYMBOL_GPL(blk_complete_sghdr_rq);





static int sg_io(struct file *file, request_queue_t *q,

static int sg_io(struct file *file, request_queue_t *q,

		struct gendisk *bd_disk, struct sg_io_hdr *hdr)

		struct gendisk *bd_disk, struct sg_io_hdr *hdr)

include/linux/blkdev.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -698,11 +698,6 @@ extern int blk_execute_rq(request_queue_t *, struct gendisk *, 
			  struct request *, int);

			  struct request *, int);

extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,

extern void blk_execute_rq_nowait(request_queue_t *, struct gendisk *,

				  struct request *, int, rq_end_io_fn *);

				  struct request *, int, rq_end_io_fn *);

extern int blk_fill_sghdr_rq(request_queue_t *, struct request *,

		      struct sg_io_hdr *, int);

extern int blk_unmap_sghdr_rq(struct request *, struct sg_io_hdr *);

extern int blk_complete_sghdr_rq(struct request *, struct sg_io_hdr *,

			  struct bio *);

extern int blk_verify_command(unsigned char *, int);

extern int blk_verify_command(unsigned char *, int);





static inline request_queue_t *bdev_get_queue(struct block_device *bdev)

static inline request_queue_t *bdev_get_queue(struct block_device *bdev)