zfcp: drop duplicate fsf_command from zfcp_fsf_req which is also in QTCB header
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hannes Reinecke
Reviewed-byQuoted 38 lines · Steffen Maier
Status read buffers (SRBs, unsolicited notifications) never use a QTCB [
zfcp_fsf_req_create()].zfcp_fsf_req_send()already uses this to distinguish SRBs from other FSF request types. We can re-use this method inzfcp_fsf_req_complete(). Introduce a helper function to make the check forreq->qtcbless magic.SRBs always are
FSF_QTCB_UNSOLICITED_STATUS, so we can hard-code this for the two trace functions dealing with SRBs.All other FSF request types have a QTCB and we can get the
fsf_commandfrom there.
zfcp_dbf_hba_fsf_response()and thuszfcp_dbf_hba_fsf_res()are only called for non-SRB requests so it's safe to dereference the QTCB [zfcp_fsf_req_complete()returns early on SRB, else calls
zfcp_fsf_protstatus_eval()which callszfcp_dbf_hba_fsf_response()].
Inzfcp_scsi_forget_cmnd()we guard the QTCB dereference with a preceding NULL check and rely on boolean shortcut evaluation.As a side effect, this causes an alignment hole which we can close in a later patch after having cleaned up all fields of struct
zfcp_fsf_req. Before:$ pahole -C zfcp_fsf_req drivers/s390/scsi/zfcp.ko ... u32 status; /* 136 4 */ u32 fsf_command; /* 140 4 */ struct fsf_qtcb * qtcb; /* 144 8 */ ... After: $ pahole -C zfcp_fsf_req drivers/s390/scsi/zfcp.ko ... u32 status; /* 136 4 */ /* XXX 4 bytes hole, try to pack */ struct fsf_qtcb * qtcb; /* 144 8 */ ...Signed-off-by Steffen Maier <[email protected]>Reviewed-by Benjamin Block <[email protected]>
Quoted 8 lines
--- drivers/s390/scsi/zfcp_dbf.c | 8 ++++---- drivers/s390/scsi/zfcp_dbf.h | 4 ++-- drivers/s390/scsi/zfcp_def.h | 7 +++++-- drivers/s390/scsi/zfcp_fsf.c | 14 ++++++-------- drivers/s390/scsi/zfcp_scsi.c | 4 +++- 5 files changed, 20 insertions(+), 17 deletions(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N�rnberg GF: F. Imend�rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N�rnberg)