diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-24 21:55:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 23:07:49 -0400 |
commit | 3cc27547d6ee2d50ecdd11e9127bc3cd1947e8dd (patch) | |
tree | d70857f363fea3f8bc928bd2fd10d9a277c119bd /include/scsi/libsas.h | |
parent | 855fc73bf81e8f99606d6f5914c5b7c3b079d718 (diff) |
[PATCH] SCSI gfp_t annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r-- | include/scsi/libsas.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 8e39982fc3db..9582e8401669 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -534,7 +534,7 @@ struct sas_task { | |||
534 | #define SAS_TASK_STATE_DONE 2 | 534 | #define SAS_TASK_STATE_DONE 2 |
535 | #define SAS_TASK_STATE_ABORTED 4 | 535 | #define SAS_TASK_STATE_ABORTED 4 |
536 | 536 | ||
537 | static inline struct sas_task *sas_alloc_task(unsigned long flags) | 537 | static inline struct sas_task *sas_alloc_task(gfp_t flags) |
538 | { | 538 | { |
539 | extern kmem_cache_t *sas_task_cache; | 539 | extern kmem_cache_t *sas_task_cache; |
540 | struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags); | 540 | struct sas_task *task = kmem_cache_alloc(sas_task_cache, flags); |
@@ -570,7 +570,7 @@ struct sas_domain_function_template { | |||
570 | void (*lldd_dev_gone)(struct domain_device *); | 570 | void (*lldd_dev_gone)(struct domain_device *); |
571 | 571 | ||
572 | int (*lldd_execute_task)(struct sas_task *, int num, | 572 | int (*lldd_execute_task)(struct sas_task *, int num, |
573 | unsigned long gfp_flags); | 573 | gfp_t gfp_flags); |
574 | 574 | ||
575 | /* Task Management Functions. Must be called from process context. */ | 575 | /* Task Management Functions. Must be called from process context. */ |
576 | int (*lldd_abort_task)(struct sas_task *); | 576 | int (*lldd_abort_task)(struct sas_task *); |