kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)

Browse source 
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 348447e857
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>
This commit is contained in:
Martin Peschke 2008-04-17 00:08:03 +02:00 committed by James Bottomley
parent 95e7a8efd7
commit ee95a16d39
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/s390/scsi/zfcp_dbf.c
View file

@ -623,7 +623,6 @@ static int zfcp_rec_dbf_view_format(debug_info_t *id, struct debug_view *view,
zfcp_dbf_out(&p, "id", "%d", r->id2); zfcp_dbf_out(&p, "id", "%d", r->id2);
switch (r->id) { switch (r->id) {
case ZFCP_REC_DBF_ID_THREAD: case ZFCP_REC_DBF_ID_THREAD:
zfcp_dbf_out(&p, "sema", "%d", r->u.thread.sema);
zfcp_dbf_out(&p, "total", "%d", r->u.thread.total); zfcp_dbf_out(&p, "total", "%d", r->u.thread.total);
zfcp_dbf_out(&p, "ready", "%d", r->u.thread.ready); zfcp_dbf_out(&p, "ready", "%d", r->u.thread.ready);
zfcp_dbf_out(&p, "running", "%d", r->u.thread.running); 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)
memset(r, 0, sizeof(*r)); memset(r, 0, sizeof(*r));
r->id = ZFCP_REC_DBF_ID_THREAD; r->id = ZFCP_REC_DBF_ID_THREAD;
r->id2 = id2; r->id2 = id2;
r->u.thread.sema = atomic_read(&adapter->erp_ready_sem.count);
r->u.thread.total = total; r->u.thread.total = total;
r->u.thread.ready = ready; r->u.thread.ready = ready;
r->u.thread.running = running; r->u.thread.running = running;

1
drivers/s390/scsi/zfcp_dbf.h
View file

@ -35,7 +35,6 @@ struct zfcp_dbf_dump {
} __attribute__ ((packed)); } __attribute__ ((packed));
struct zfcp_rec_dbf_record_thread { struct zfcp_rec_dbf_record_thread {
u32 sema;
u32 total; u32 total;
u32 ready; u32 ready;
u32 running; u32 running;