Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee95a16d authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley
Browse files

[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 348447e8
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: default avatarMartin Peschke <mp3@de.ibm.com>
Acked-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 95e7a8ef

drivers/s390/scsi/zfcp_dbf.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

	switch (r->id) {

	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, "ready", "%d", r->u.thread.ready);

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

	r->id = ZFCP_REC_DBF_ID_THREAD;

	r->id2 = id2;

	r->u.thread.sema = atomic_read(&adapter->erp_ready_sem.count);

	r->u.thread.total = total;

	r->u.thread.ready = ready;

	r->u.thread.running = running;

drivers/s390/scsi/zfcp_dbf.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct zfcp_dbf_dump { 
} __attribute__ ((packed));



struct zfcp_rec_dbf_record_thread {

	u32 sema;

	u32 total;

	u32 ready;

	u32 running;