diff options
author | Jens Axboe <axboe@fb.com> | 2016-08-08 16:42:42 +0300 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-08-08 16:42:42 +0300 |
commit | d3f422c8d58b2f0d68a51db88389a715dc10b4d2 (patch) | |
tree | 128fe3046bdb500af63a38d5ed407add7c969e76 /drivers/nvme/target/nvmet.h | |
parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
parent | e3266378bdbca82c2854fc612fa9a391eba1f173 (diff) | |
download | linux-d3f422c8d58b2f0d68a51db88389a715dc10b4d2.tar.xz |
Merge branch 'nvmf-4.8-rc' of git://git.infradead.org/nvme-fabrics into for-linus
Sagi writes:
Mostly stability fixes for nvmet, rdma:
- fix uninitialized rdma_cm private data from Roland.
- rdma device removal handling (host and target).
- fix controller disconnect during active mounts.
- fix namespaces lost after fabric reconnects.
- remove redundant calls to namespace removal (rdma, loop).
- actually send controller shutdown when disconnecting.
- reconnect fixes (ns rescan and aen requeue)
- nvmet controller serial number inconsistency fix.
Diffstat (limited to 'drivers/nvme/target/nvmet.h')
-rw-r--r-- | drivers/nvme/target/nvmet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index 57dd6d834c28..76b6eedccaf9 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -113,6 +113,7 @@ struct nvmet_ctrl { struct mutex lock; u64 cap; + u64 serial; u32 cc; u32 csts; |