UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] SCSI gfp_t annotations 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-09-25 02:55:40 +01:00 committed by Linus Torvalds
parent 855fc73bf8
commit 3cc27547d6
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/aic94xx/aic94xx.h
View File

@ -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 *);

8
drivers/scsi/aic94xx/aic94xx_hwi.c
View File

@ -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 @@ Err_unroll:
}
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 @@ undo:
*/
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;

6
drivers/scsi/aic94xx/aic94xx_hwi.h
View File

@ -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);

10
drivers/scsi/aic94xx/aic94xx_task.c
View File

@ -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 @@ Again:
/* ---------- 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);

2
drivers/scsi/libsas/sas_scsi_host.c
View File

@ -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;

4
include/scsi/libsas.h
View File

@ -534,7 +534,7 @@ struct sas_task {
#define SAS_TASK_STATE_DONE 2
#define SAS_TASK_STATE_ABORTED 4
static inline struct sas_task *sas_alloc_task(unsigned long flags)
static inline struct sas_task *sas_alloc_task(gfp_t flags)
{
extern kmem_cache_t *sas_task_cache;
struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags);
@ -570,7 +570,7 @@ struct sas_domain_function_template {
void (*lldd_dev_gone)(struct domain_device *);
int (*lldd_execute_task)(struct sas_task *, int num,
unsigned long gfp_flags);
gfp_t gfp_flags);
/* Task Management Functions. Must be called from process context. */
int (*lldd_abort_task)(struct sas_task *);