aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2006-10-01 02:28:10 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 03:39:24 -0400
commit6e9a4738c9fadb7cbdcabc1e3b415159f3741ed9 (patch)
tree0e470bb8cd431d59698da5a6999ff35a347619a3 /drivers/block
parent397d6140e93156ecb9cafcd9be0db10ff3c12ab3 (diff)
[PATCH] completions: lockdep annotate on stack completions
All on stack DECLARE_COMPLETIONs should be replaced by: DECLARE_COMPLETION_ONSTACK Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Ingo Molnar <mingo@elte.hu> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/cciss.c6
-rw-r--r--drivers/block/cciss_scsi.c2
-rw-r--r--drivers/block/paride/pd.c2
-rw-r--r--drivers/block/pktcdvd.c2
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 2568640430fb..b3f639fbf220 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -770,7 +770,7 @@ static void DAC960_P_QueueCommand(DAC960_Command_T *Command)
770static void DAC960_ExecuteCommand(DAC960_Command_T *Command) 770static void DAC960_ExecuteCommand(DAC960_Command_T *Command)
771{ 771{
772 DAC960_Controller_T *Controller = Command->Controller; 772 DAC960_Controller_T *Controller = Command->Controller;
773 DECLARE_COMPLETION(Completion); 773 DECLARE_COMPLETION_ONSTACK(Completion);
774 unsigned long flags; 774 unsigned long flags;
775 Command->Completion = &Completion; 775 Command->Completion = &Completion;
776 776
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d2d45eaf3681..99f87efe0f58 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -879,7 +879,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
879 char *buff = NULL; 879 char *buff = NULL;
880 u64bit temp64; 880 u64bit temp64;
881 unsigned long flags; 881 unsigned long flags;
882 DECLARE_COMPLETION(wait); 882 DECLARE_COMPLETION_ONSTACK(wait);
883 883
884 if (!arg) 884 if (!arg)
885 return -EINVAL; 885 return -EINVAL;
@@ -997,7 +997,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
997 BYTE sg_used = 0; 997 BYTE sg_used = 0;
998 int status = 0; 998 int status = 0;
999 int i; 999 int i;
1000 DECLARE_COMPLETION(wait); 1000 DECLARE_COMPLETION_ONSTACK(wait);
1001 __u32 left; 1001 __u32 left;
1002 __u32 sz; 1002 __u32 sz;
1003 BYTE __user *data_ptr; 1003 BYTE __user *data_ptr;
@@ -1816,7 +1816,7 @@ static int sendcmd_withirq(__u8 cmd,
1816 u64bit buff_dma_handle; 1816 u64bit buff_dma_handle;
1817 unsigned long flags; 1817 unsigned long flags;
1818 int return_status; 1818 int return_status;
1819 DECLARE_COMPLETION(wait); 1819 DECLARE_COMPLETION_ONSTACK(wait);
1820 1820
1821 if ((c = cmd_alloc(h, 0)) == NULL) 1821 if ((c = cmd_alloc(h, 0)) == NULL)
1822 return -ENOMEM; 1822 return -ENOMEM;
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 05f79d7393f7..bb15051ffbe0 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -766,7 +766,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *c,
766 int direction) 766 int direction)
767{ 767{
768 unsigned long flags; 768 unsigned long flags;
769 DECLARE_COMPLETION(wait); 769 DECLARE_COMPLETION_ONSTACK(wait);
770 770
771 cp->cmd_type = CMD_IOCTL_PEND; // treat this like an ioctl 771 cp->cmd_type = CMD_IOCTL_PEND; // treat this like an ioctl
772 cp->scsi_cmd = NULL; 772 cp->scsi_cmd = NULL;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 38578b9dbfd1..40a11e567970 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -713,7 +713,7 @@ static void do_pd_request(request_queue_t * q)
713static int pd_special_command(struct pd_unit *disk, 713static int pd_special_command(struct pd_unit *disk,
714 enum action (*func)(struct pd_unit *disk)) 714 enum action (*func)(struct pd_unit *disk))
715{ 715{
716 DECLARE_COMPLETION(wait); 716 DECLARE_COMPLETION_ONSTACK(wait);
717 struct request rq; 717 struct request rq;
718 int err = 0; 718 int err = 0;
719 719
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 888d1aceeeff..a6b2aa67c9b2 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -348,7 +348,7 @@ static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *
348 char sense[SCSI_SENSE_BUFFERSIZE]; 348 char sense[SCSI_SENSE_BUFFERSIZE];
349 request_queue_t *q; 349 request_queue_t *q;
350 struct request *rq; 350 struct request *rq;
351 DECLARE_COMPLETION(wait); 351 DECLARE_COMPLETION_ONSTACK(wait);
352 int err = 0; 352 int err = 0;
353 353
354 q = bdev_get_queue(pd->bdev); 354 q = bdev_get_queue(pd->bdev);