Commit f1bea55d authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove various exports that were only used by scsi_tgt 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent aa3fc090

drivers/scsi/scsi.c

+3 −7
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ scsi_host_alloc_command(struct Scsi_Host *shost, gfp_t gfp_mask) 
 * Description: allocate a struct scsi_cmd from host's slab, recycling from the

 *              host's free_list if necessary.

 */

struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)

static struct scsi_cmnd *

__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)

{

	struct scsi_cmnd *cmd = scsi_host_alloc_command(shost, gfp_mask);
@@ -265,7 +266,6 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask) 


	return cmd;

}

EXPORT_SYMBOL_GPL(__scsi_get_command);



/**

 * scsi_get_command - Allocate and setup a scsi command block
@@ -291,14 +291,13 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask) 
	cmd->jiffies_at_alloc = jiffies;

	return cmd;

}

EXPORT_SYMBOL(scsi_get_command);



/**

 * __scsi_put_command - Free a struct scsi_cmnd

 * @shost: dev->host

 * @cmd: Command to free

 */

void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd)

static void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd)

{

	unsigned long flags;
@@ -314,7 +313,6 @@ void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd) 
	if (likely(cmd != NULL))

		scsi_host_free_command(shost, cmd);

}

EXPORT_SYMBOL(__scsi_put_command);



/**

 * scsi_put_command - Free a scsi command block
@@ -338,7 +336,6 @@ void scsi_put_command(struct scsi_cmnd *cmd) 


	__scsi_put_command(cmd->device->host, cmd);

}

EXPORT_SYMBOL(scsi_put_command);



static struct scsi_host_cmd_pool *

scsi_find_host_cmd_pool(struct Scsi_Host *shost)
@@ -801,7 +798,6 @@ void scsi_finish_command(struct scsi_cmnd *cmd) 
	}

	scsi_io_completion(cmd, good_bytes);

}

EXPORT_SYMBOL(scsi_finish_command);



/**

 * scsi_adjust_queue_depth - Let low level drivers change a device's queue depth

drivers/scsi/scsi_lib.c

+2 −4
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static void scsi_free_sgtable(struct scsi_data_buffer *sdb) 
 *		the __init_io() function.  Primarily this would involve

 *		the scatter-gather table.

 */

void scsi_release_buffers(struct scsi_cmnd *cmd)

static void scsi_release_buffers(struct scsi_cmnd *cmd)

{

	if (cmd->sdb.table.nents)

		scsi_free_sgtable(&cmd->sdb);
@@ -589,7 +589,6 @@ void scsi_release_buffers(struct scsi_cmnd *cmd) 
	if (scsi_prot_sg_count(cmd))

		scsi_free_sgtable(cmd->prot_sdb);

}

EXPORT_SYMBOL(scsi_release_buffers);



static void scsi_release_bidi_buffers(struct scsi_cmnd *cmd)

{
@@ -1609,7 +1608,7 @@ static void scsi_request_fn(struct request_queue *q) 
		blk_delay_queue(q, SCSI_QUEUE_DELAY);

}



u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost)

static u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost)

{

	struct device *host_dev;

	u64 bounce_limit = 0xffffffff;
@@ -1629,7 +1628,6 @@ u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost) 


	return bounce_limit;

}

EXPORT_SYMBOL(scsi_calculate_bounce_limit);



struct request_queue *__scsi_alloc_queue(struct Scsi_Host *shost,

					 request_fn_proc *request_fn)

include/scsi/scsi_cmnd.h

+0 −3
Original line number Diff line number Diff line
@@ -150,9 +150,7 @@ static inline struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd) 
}



extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);

extern struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *, gfp_t);

extern void scsi_put_command(struct scsi_cmnd *);

extern void __scsi_put_command(struct Scsi_Host *, struct scsi_cmnd *);

extern void scsi_finish_command(struct scsi_cmnd *cmd);



extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count,
@@ -160,7 +158,6 @@ extern void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count, 
extern void scsi_kunmap_atomic_sg(void *virt);



extern int scsi_init_io(struct scsi_cmnd *cmd, gfp_t gfp_mask);

extern void scsi_release_buffers(struct scsi_cmnd *cmd);



extern int scsi_dma_map(struct scsi_cmnd *cmd);

extern void scsi_dma_unmap(struct scsi_cmnd *cmd);

include/scsi/scsi_host.h

+0 −2
Original line number Diff line number Diff line
@@ -795,8 +795,6 @@ extern struct Scsi_Host *scsi_host_lookup(unsigned short); 
extern const char *scsi_host_state_name(enum scsi_host_state);

extern void scsi_cmd_get_serial(struct Scsi_Host *, struct scsi_cmnd *);



extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *);



static inline int __must_check scsi_add_host(struct Scsi_Host *host,

					     struct device *dev)

{