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

Commit c53033f6 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: drivers/scsi 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9796fdd8

drivers/scsi/eata.c

+1 −1
Original line number Diff line number Diff line
@@ -1357,7 +1357,7 @@ static int port_detect(unsigned long port_base, unsigned int j, 


	for (i = 0; i < shost->can_queue; i++) {

		size_t sz = shost->sg_tablesize *sizeof(struct sg_list);

		unsigned int gfp_mask = (shost->unchecked_isa_dma ? GFP_DMA : 0) | GFP_ATOMIC;

		gfp_t gfp_mask = (shost->unchecked_isa_dma ? GFP_DMA : 0) | GFP_ATOMIC;

		ha->cp[i].sglist = kmalloc(sz, gfp_mask);

		if (!ha->cp[i].sglist) {

			printk

drivers/scsi/hosts.c

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ static void scsi_host_dev_release(struct device *dev) 
struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)

{

	struct Scsi_Host *shost;

	int gfp_mask = GFP_KERNEL, rval;

	gfp_t gfp_mask = GFP_KERNEL;

	int rval;



	if (sht->unchecked_isa_dma && privsize)

		gfp_mask |= __GFP_DMA;

drivers/scsi/lpfc/lpfc_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#define LPFC_MEM_POOL_SIZE      64      /* max elem in non-DMA safety pool */



static void *

lpfc_pool_kmalloc(unsigned int gfp_flags, void *data)

lpfc_pool_kmalloc(gfp_t gfp_flags, void *data)

{

	return kmalloc((unsigned long)data, gfp_flags);

}

drivers/scsi/osst.c

+4 −2
Original line number Diff line number Diff line
@@ -5146,7 +5146,8 @@ static long osst_compat_ioctl(struct file * file, unsigned int cmd_in, unsigned 
/* Try to allocate a new tape buffer skeleton. Caller must not hold os_scsi_tapes_lock */

static struct osst_buffer * new_tape_buffer( int from_initialization, int need_dma, int max_sg )

{

	int i, priority;

	int i;

	gfp_t priority;

	struct osst_buffer *tb;



	if (from_initialization)
@@ -5178,7 +5179,8 @@ static struct osst_buffer * new_tape_buffer( int from_initialization, int need_d 
/* Try to allocate a temporary (while a user has the device open) enlarged tape buffer */

static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)

{

	int segs, nbr, max_segs, b_size, priority, order, got;

	int segs, nbr, max_segs, b_size, order, got;

	gfp_t priority;



	if (STbuffer->buffer_size >= OS_FRAME_SIZE)

		return 1;

drivers/scsi/qla2xxx/qla_gbl.h

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ extern int qla2x00_load_risc(struct scsi_qla_host *, uint32_t *); 
extern int qla24xx_load_risc_flash(scsi_qla_host_t *, uint32_t *);

extern int qla24xx_load_risc_hotplug(scsi_qla_host_t *, uint32_t *);



extern fc_port_t *qla2x00_alloc_fcport(scsi_qla_host_t *, int);

extern fc_port_t *qla2x00_alloc_fcport(scsi_qla_host_t *, gfp_t);



extern int qla2x00_loop_resync(scsi_qla_host_t *);
@@ -277,7 +277,7 @@ extern int qla2x00_fdmi_register(scsi_qla_host_t *); 
/*

 * Global Function Prototypes in qla_rscn.c source file.

 */

extern fc_port_t *qla2x00_alloc_rscn_fcport(scsi_qla_host_t *, int);

extern fc_port_t *qla2x00_alloc_rscn_fcport(scsi_qla_host_t *, gfp_t);

extern int qla2x00_handle_port_rscn(scsi_qla_host_t *, uint32_t, fc_port_t *,

    int);

extern void qla2x00_process_iodesc(scsi_qla_host_t *, struct mbx_entry *);