diff options
author | Martin Peschke <mp3@de.ibm.com> | 2008-04-16 18:08:03 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-17 13:56:49 -0400 |
commit | ee95a16d3950367d32beb6ffed287666631dbda9 (patch) | |
tree | 05732093341f724ae76a3abea0868a98f083a28a | |
parent | 95e7a8efd79d4eb74646ed5cb998599f21627091 (diff) |
[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
as seen in linux-next tree:
drivers/s390/scsi/zfcp_dbf.c: In function ‘zfcp_rec_dbf_event_thread’:
drivers/s390/scsi/zfcp_dbf.c:697: warning: passing argument 1 of ‘atomic_read’
from incompatible pointer type
Caused by recent git commit:
commit 348447e85749120ad600a5c8e23b6bb7058b931d
Author: Martin Peschke <mp3@de.ibm.com>
Date: Thu Mar 27 14:22:01 2008 +0100
[SCSI] zfcp: Add trace records for recovery thread and its queues
We are not supposed to poke inside semaphore.
Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Acked-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | drivers/s390/scsi/zfcp_dbf.c | 2 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_dbf.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 85ba4cc4190e..c34a874482a5 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
@@ -623,7 +623,6 @@ static int zfcp_rec_dbf_view_format(debug_info_t *id, struct debug_view *view, | |||
623 | zfcp_dbf_out(&p, "id", "%d", r->id2); | 623 | zfcp_dbf_out(&p, "id", "%d", r->id2); |
624 | switch (r->id) { | 624 | switch (r->id) { |
625 | case ZFCP_REC_DBF_ID_THREAD: | 625 | case ZFCP_REC_DBF_ID_THREAD: |
626 | zfcp_dbf_out(&p, "sema", "%d", r->u.thread.sema); | ||
627 | zfcp_dbf_out(&p, "total", "%d", r->u.thread.total); | 626 | zfcp_dbf_out(&p, "total", "%d", r->u.thread.total); |
628 | zfcp_dbf_out(&p, "ready", "%d", r->u.thread.ready); | 627 | zfcp_dbf_out(&p, "ready", "%d", r->u.thread.ready); |
629 | zfcp_dbf_out(&p, "running", "%d", r->u.thread.running); | 628 | zfcp_dbf_out(&p, "running", "%d", r->u.thread.running); |
@@ -694,7 +693,6 @@ void zfcp_rec_dbf_event_thread(u8 id2, struct zfcp_adapter *adapter, int lock) | |||
694 | memset(r, 0, sizeof(*r)); | 693 | memset(r, 0, sizeof(*r)); |
695 | r->id = ZFCP_REC_DBF_ID_THREAD; | 694 | r->id = ZFCP_REC_DBF_ID_THREAD; |
696 | r->id2 = id2; | 695 | r->id2 = id2; |
697 | r->u.thread.sema = atomic_read(&adapter->erp_ready_sem.count); | ||
698 | r->u.thread.total = total; | 696 | r->u.thread.total = total; |
699 | r->u.thread.ready = ready; | 697 | r->u.thread.ready = ready; |
700 | r->u.thread.running = running; | 698 | r->u.thread.running = running; |
diff --git a/drivers/s390/scsi/zfcp_dbf.h b/drivers/s390/scsi/zfcp_dbf.h index 732a5ba1bea9..54c34e483457 100644 --- a/drivers/s390/scsi/zfcp_dbf.h +++ b/drivers/s390/scsi/zfcp_dbf.h | |||
@@ -35,7 +35,6 @@ struct zfcp_dbf_dump { | |||
35 | } __attribute__ ((packed)); | 35 | } __attribute__ ((packed)); |
36 | 36 | ||
37 | struct zfcp_rec_dbf_record_thread { | 37 | struct zfcp_rec_dbf_record_thread { |
38 | u32 sema; | ||
39 | u32 total; | 38 | u32 total; |
40 | u32 ready; | 39 | u32 ready; |
41 | u32 running; | 40 | u32 running; |