diff options
author | Leon Romanovsky <leonro@nvidia.com> | 2022-09-27 12:56:24 +0300 |
---|---|---|
committer | Leon Romanovsky <leonro@nvidia.com> | 2022-09-27 12:56:24 +0300 |
commit | 70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b (patch) | |
tree | ed0c455d401d55ab30a251662f90a2ab41cae794 /drivers/infiniband/ulp/srp/ib_srp.c | |
parent | 8a2dd123f12f69e5373d3103da2c97fc36223e0c (diff) | |
parent | 939838632b9119614128028eaea3b1d7bf29f16f (diff) | |
download | linux-70d1b1a7f8b32b78c09b30dbcfa25ba1e470568b.tar.xz |
Merge branch 'mlx5-vfio' into mlx5-next
Merge net/mlx5 dependencies for device DMA logging.
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Diffstat (limited to 'drivers/infiniband/ulp/srp/ib_srp.c')
-rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 6058abf42ba7..7720ea270ed8 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -1282,8 +1282,7 @@ struct srp_terminate_context { int scsi_result; }; -static bool srp_terminate_cmd(struct scsi_cmnd *scmnd, void *context_ptr, - bool reserved) +static bool srp_terminate_cmd(struct scsi_cmnd *scmnd, void *context_ptr) { struct srp_terminate_context *context = context_ptr; struct srp_target_port *target = context->srp_target; |