Merge branch 'nvme-4.19' of git://git.infradead.org/nvme into for-linus

Pull NVMe fix from Christoph.

* 'nvme-4.19' of git://git.infradead.org/nvme:
  nvme: count all ANA groups for ANA Log page

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index a21caea1e080..2008fa62a373 100644
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -245,6 +245,10 @@ static void nvmet_execute_get_log_page_ana(struct nvmet_req *req)
                 offset += len;
                 ngrps++;
         }
+        for ( ; grpid <= NVMET_MAX_ANAGRPS; grpid++) {
+                if (nvmet_ana_group_enabled[grpid])
+                        ngrps++;
+        }
 
         hdr.chgcnt = cpu_to_le64(nvmet_ana_chgcnt);
         hdr.ngrps = cpu_to_le16(ngrps);