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

[PATCH] SCSI gfp_t annotations 



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

drivers/scsi/aic94xx/aic94xx.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void asd_dev_gone(struct domain_device *dev); 


void asd_invalidate_edb(struct asd_ascb *ascb, int edb_id);



int  asd_execute_task(struct sas_task *, int num, unsigned long gfp_flags);

int  asd_execute_task(struct sas_task *, int num, gfp_t gfp_flags);



/* ---------- TMFs ---------- */

int  asd_abort_task(struct sas_task *);

drivers/scsi/aic94xx/aic94xx_hwi.c

+4 −4
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int asd_init_dl(struct asd_ha_struct *asd_ha) 


/* ---------- EDB and ESCB init ---------- */



static int asd_alloc_edbs(struct asd_ha_struct *asd_ha, unsigned int gfp_flags)

static int asd_alloc_edbs(struct asd_ha_struct *asd_ha, gfp_t gfp_flags)

{

	struct asd_seq_data *seq = &asd_ha->seq;

	int i;
@@ -298,7 +298,7 @@ static int asd_alloc_edbs(struct asd_ha_struct *asd_ha, unsigned int gfp_flags) 
}



static int asd_alloc_escbs(struct asd_ha_struct *asd_ha,

			   unsigned int gfp_flags)

			   gfp_t gfp_flags)

{

	struct asd_seq_data *seq = &asd_ha->seq;

	struct asd_ascb *escb;
@@ -1028,7 +1028,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs) 
/* ---------- SCB handling ---------- */



static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha,

					      unsigned int gfp_flags)

					      gfp_t gfp_flags)

{

	extern kmem_cache_t *asd_ascb_cache;

	struct asd_seq_data *seq = &asd_ha->seq;
@@ -1086,7 +1086,7 @@ static inline struct asd_ascb *asd_ascb_alloc(struct asd_ha_struct *asd_ha, 
 */

struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct

				     *asd_ha, int *num,

				     unsigned int gfp_flags)

				     gfp_t gfp_flags)

{

	struct asd_ascb *first = NULL;

drivers/scsi/aic94xx/aic94xx_hwi.h

+3 −3
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ struct asd_ha_struct { 


/* ---------- DMA allocs ---------- */



static inline struct asd_dma_tok *asd_dmatok_alloc(unsigned int flags)

static inline struct asd_dma_tok *asd_dmatok_alloc(gfp_t flags)

{

	return kmem_cache_alloc(asd_dma_token_cache, flags);

}
@@ -254,7 +254,7 @@ static inline void asd_dmatok_free(struct asd_dma_tok *token) 


static inline struct asd_dma_tok *asd_alloc_coherent(struct asd_ha_struct *

						     asd_ha, size_t size,

						     unsigned int flags)

						     gfp_t flags)

{

	struct asd_dma_tok *token = asd_dmatok_alloc(flags);

	if (token) {
@@ -376,7 +376,7 @@ irqreturn_t asd_hw_isr(int irq, void *dev_id, struct pt_regs *regs); 


struct asd_ascb *asd_ascb_alloc_list(struct asd_ha_struct

				     *asd_ha, int *num,

				     unsigned int gfp_mask);

				     gfp_t gfp_mask);



int  asd_post_ascb_list(struct asd_ha_struct *asd_ha, struct asd_ascb *ascb,

			int num);

drivers/scsi/aic94xx/aic94xx_task.c

+5 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static const u8 data_dir_flags[] = { 


static inline int asd_map_scatterlist(struct sas_task *task,

				      struct sg_el *sg_arr,

				      unsigned long gfp_flags)

				      gfp_t gfp_flags)

{

	struct asd_ascb *ascb = task->lldd_task;

	struct asd_ha_struct *asd_ha = ascb->ha;
@@ -368,7 +368,7 @@ static void asd_task_tasklet_complete(struct asd_ascb *ascb, 
/* ---------- ATA ---------- */



static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,

			      unsigned long gfp_flags)

			      gfp_t gfp_flags)

{

	struct domain_device *dev = task->dev;

	struct scb *scb;
@@ -437,7 +437,7 @@ static void asd_unbuild_ata_ascb(struct asd_ascb *a) 
/* ---------- SMP ---------- */



static int asd_build_smp_ascb(struct asd_ascb *ascb, struct sas_task *task,

			      unsigned long gfp_flags)

			      gfp_t gfp_flags)

{

	struct asd_ha_struct *asd_ha = ascb->ha;

	struct domain_device *dev = task->dev;
@@ -487,7 +487,7 @@ static void asd_unbuild_smp_ascb(struct asd_ascb *a) 
/* ---------- SSP ---------- */



static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task,

			      unsigned long gfp_flags)

			      gfp_t gfp_flags)

{

	struct domain_device *dev = task->dev;

	struct scb *scb;
@@ -550,7 +550,7 @@ static inline int asd_can_queue(struct asd_ha_struct *asd_ha, int num) 
}



int asd_execute_task(struct sas_task *task, const int num,

		     unsigned long gfp_flags)

		     gfp_t gfp_flags)

{

	int res = 0;

	LIST_HEAD(alist);

drivers/scsi/libsas/sas_scsi_host.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd) 


static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,

					       struct domain_device *dev,

					       unsigned long gfp_flags)

					       gfp_t gfp_flags)

{

	struct sas_task *task = sas_alloc_task(gfp_flags);

	struct scsi_lun lun;