diff options
| author | Keith Busch <keith.busch@intel.com> | 2015-07-14 11:57:48 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-07-15 15:36:47 -0600 |
| commit | 7bee607472aa2e5a36dfe143e5a625be06125f53 (patch) | |
| tree | f29a2b65c3db1a44c63c44244be1237ca3eb750f | |
| parent | 77b5a08427e87514c33730afc18cd02c9475e2c3 (diff) | |
| download | linux-7bee607472aa2e5a36dfe143e5a625be06125f53.tar.bz2 | |
NVMe: Reread partitions on metadata formats
This patch has the driver automatically reread partitions if a namespace
has a separate metadata format. Previously revalidating a disk was
sufficient to get the correct capacity set on such formatted drives,
but partitions that may exist would not have been surfaced.
Reported-by: Paul Grabinar <paul.grabinar@ranbarg.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Tested-by: Paul Grabinar <paul.grabinar@ranbarg.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/block/nvme-core.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index d1d6141920d3..7920c2741b47 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -2108,8 +2108,17 @@ static void nvme_alloc_ns(struct nvme_dev *dev, unsigned nsid) goto out_free_disk; add_disk(ns->disk); - if (ns->ms) - revalidate_disk(ns->disk); + if (ns->ms) { + struct block_device *bd = bdget_disk(ns->disk, 0); + if (!bd) + return; + if (blkdev_get(bd, FMODE_READ, NULL)) { + bdput(bd); + return; + } + blkdev_reread_part(bd); + blkdev_put(bd, FMODE_READ); + } return; out_free_disk: kfree(disk); |