Commit 634a610f authored by Jim Harris's avatar Jim Harris Committed by Konrad Sztyber
Browse files

nvme: also check user_cb_arg when checking for request abort matches 



DSM commands stuff the user's cb_arg in req->user_cb_arg, not
req->cb_arg. So we need to consider user_cb_arg too when looking
for commands that match the caller's abort request.

Fixes issue #3490.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I5398b7323707864a8cc7e3f512e4baca1e8d80fc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24587


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 2a893d9d

lib/nvme/nvme_internal.h

+1 −0
Original line number Diff line number Diff line
@@ -1519,6 +1519,7 @@ static inline bool 
nvme_request_abort_match(struct nvme_request *req, void *cmd_cb_arg)

{

	return req->cb_arg == cmd_cb_arg ||

	       req->user_cb_arg == cmd_cb_arg ||

	       (req->parent != NULL && req->parent->cb_arg == cmd_cb_arg);

}