diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2020-04-08 08:41:26 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-04-08 08:41:26 -0600 |
| commit | d9a9755a83d706fec22e4364b2f91568dfb8c4ea (patch) | |
| tree | 892b449a307ae2a033bb0a4d7f87336d77321d70 /include | |
| parent | block: fix busy device checking in blk_drop_partitions (diff) | |
| parent | nvmet-rdma: fix double free of rdma queue (diff) | |
| download | linux-dev-d9a9755a83d706fec22e4364b2f91568dfb8c4ea.tar.xz linux-dev-d9a9755a83d706fec22e4364b2f91568dfb8c4ea.zip | |
Merge branch 'nvme-5.7' of git://git.infradead.org/nvme into block-5.7
Pull NVMe fixes from Christoph.
* 'nvme-5.7' of git://git.infradead.org/nvme:
nvmet-rdma: fix double free of rdma queue
nvme-fc: Revert "add module to ops template to allow module references"
nvme: fix deadlock caused by ANA update wrong locking
nvmet-rdma: fix bonding failover possible NULL deref
nvmet: fix NULL dereference when removing a referral
nvme: inherit stable pages constraint in the mpath stack device
nvme-tcp: fix possible crash in recv error flow
nvme-tcp: don't poll a non-live queue
nvme-tcp: fix possible crash in write_zeroes processing
nvmet-fc: fix typo in comment
nvme-rdma: Replace comma with a semicolon
nvme-fcloop: fix deallocation of working context
nvme: fix compat address handling in several ioctls
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme-fc-driver.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/nvme-fc-driver.h b/include/linux/nvme-fc-driver.h index 6d0d70f3219c..10f81629b9ce 100644 --- a/include/linux/nvme-fc-driver.h +++ b/include/linux/nvme-fc-driver.h @@ -270,8 +270,6 @@ struct nvme_fc_remote_port { * * Host/Initiator Transport Entrypoints/Parameters: * - * @module: The LLDD module using the interface - * * @localport_delete: The LLDD initiates deletion of a localport via * nvme_fc_deregister_localport(). However, the teardown is * asynchronous. This routine is called upon the completion of the @@ -385,8 +383,6 @@ struct nvme_fc_remote_port { * Value is Mandatory. Allowed to be zero. */ struct nvme_fc_port_template { - struct module *module; - /* initiator-based functions */ void (*localport_delete)(struct nvme_fc_local_port *); void (*remoteport_delete)(struct nvme_fc_remote_port *); |