zfcp changes for v6.14
Subsystems (3)
Nihar Panda
maintainercover zfcp changes for v6.14
Hello James, Martin,
here is a small set of changes for the zFCP device driver.
Fedor Loshakov (1):
zfcp: correct kdoc parameter description for sending ELS and CT
Steffen Maier (2):
zfcp: clarify zfcp_port refcount ownership during "link" test
MAINTAINERS: Update zfcp entry
MAINTAINERS | 3 +-- drivers/s390/scsi/zfcp_fc.c | 7 ++++++- drivers/s390/scsi/zfcp_fsf.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-)
base-commit: 40384c840ea1944d7c5a392e8975ed088ecf0b37
Signature · 1 line
2.45.2
Nihar Panda
maintainerPATCH 1/3 zfcp: correct kdoc parameter description for sending ELS and CT
From: Fedor Loshakov <[email protected]>
Since commit 7c7dc196814b ("[SCSI] zfcp: Simplify handling of ct and els requests") there are no more such structures as zfcp_send_els and zfcp_send_ct. Instead there is now one common fsf structure to hold zfcp data for ct and els requests. Fix parameter description for zfcp_fsf_send_ct() and zfcp_fsf_send_els() accordingly.
--- drivers/s390/scsi/zfcp_fsf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/s390/scsi/zfcp_fsf.c +2 -2
@@ -1218,7 +1218,7 @@ static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,/** * zfcp_fsf_send_ct - initiate a Generic Service request (FC-GS) * @wka_port: pointer to zfcp WKA port to send CT/GS to -* @ct: pointer to struct zfcp_send_ct with data for request +* @ct: pointer to struct zfcp_fsf_ct_els with data for CT request * @pool: if non-null this mempool is used to allocate struct zfcp_fsf_req * @timeout: timeout that hardware should use, and a later software timeout */
@@ -1316,7 +1316,7 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req)* zfcp_fsf_send_els - initiate an ELS command (FC-FS) * @adapter: pointer to zfcp adapter * @d_id: N_Port_ID to send ELS to -* @els: pointer to struct zfcp_send_els with data for the command +* @els: pointer to struct zfcp_fsf_ct_els with data for the ELS command * @timeout: timeout that hardware should use, and a later software timeout */ int zfcp_fsf_send_els(struct zfcp_adapter *adapter, u32 d_id,
Signature · 1 line
2.45.2
Nihar Panda
maintainerPATCH 2/3 zfcp: clarify zfcp_port refcount ownership during "link" test
In reply to Nihar PandaFrom: Steffen Maier <[email protected]>
--- drivers/s390/scsi/zfcp_fc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/s390/scsi/zfcp_fc.c +6 -1
@@ -537,6 +537,11 @@ static void zfcp_fc_adisc_handler(void *data)/* port is still good, nothing to do */ out:atomic_andnot (ZFCP_STATUS_PORT_LINK_TEST , &port->status); +/* +* port ref comes from get_device() in zfcp_fc_test_link() and +* work item zfcp_fc_link_test_work() passes ref via +* zfcp_fc_adisc() to here, if zfcp_fc_adisc() could send ADISC +*/ put_device (&port->dev);kmem_cache_free (zfcp_fc_req_cache, fc_req); }
@@ -603,7 +608,7 @@ void zfcp_fc_link_test_work(struct work_struct *work) retval =zfcp_fc_adisc (port);if (retval ==0 ) -return ; +return ;/* port ref passed to zfcp_fc_adisc(), no put here */ /* send of ADISC was not possible */ atomic_andnot (ZFCP_STATUS_PORT_LINK_TEST , &port->status);
Signature · 1 line
2.45.2
Nihar Panda
maintainerPATCH 3/3 MAINTAINERS: Update zfcp entry
In reply to Nihar PandaFrom: Steffen Maier <[email protected]>
Nihar takes over the zfcp maintainer work. Update the MAINTAINERS entry accordingly.
--- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
MAINTAINERS +1 -2
@@ -20656,8 +20656,7 @@ F: arch/s390/include/uapi/asm/zcrypt.h F: drivers/s390/crypto/ S390 ZFCP DRIVER -M: Steffen Maier <[email protected]> -M: Benjamin Block <[email protected]> +M: Nihar Panda <[email protected]> L: [email protected] S: Supported F: drivers/s390/scsi/zfcp_*
Signature · 1 line
2.45.2
Martin K. Petersen
AppliedNihar,
Quoted 1 line
here is a small set of changes for the zFCP device driver.
Applied to 6.14/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 10 lines · Nihar Panda
here is a small set of changes for the zFCP device driver.
Fedor Loshakov (1):
zfcp: correct kdoc parameter description for sending ELS and CTSteffen Maier (2):
zfcp: clarifyzfcp_portrefcount ownership during "link" test
MAINTAINERS: Update zfcp entry[...]
Applied to 6.14/scsi-queue, thanks!
[1/3] zfcp: correct kdoc parameter description for sending ELS and CT
https://git.kernel.org/mkp/scsi/c/9fe5b6130baf [2/3] zfcp: clarify zfcp_port refcount ownership during "link" test https://git.kernel.org/mkp/scsi/c/32574fe6e19d [3/3] MAINTAINERS: Update zfcp entry https://git.kernel.org/mkp/scsi/c/bd55f56188ca
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering