@@ -936,6 +936,12 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno)
return bdev;
}
+struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t sector)
+{
+ return disk_map_sector_rcu(disk, sector);
+}
+EXPORT_SYMBOL(bdget_disk_sector);
+
/*
* print a full list of all partitions - intended for places where the root
* filesystem can't be mounted and thus to give the victim some idea of what
@@ -253,6 +253,24 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
return blk_status_to_errno(rc);
}
+static int pmem_corrupted_range(struct gendisk *disk, struct block_device *bdev,
+ loff_t disk_offset, size_t len, void *data)
+{
+ loff_t bdev_offset;
+ sector_t disk_sector = disk_offset >> SECTOR_SHIFT;
+ int rc = -ENODEV;
+
+ bdev = bdget_disk_sector(disk, disk_sector);
+ if (!bdev)
+ return rc;
+
+ bdev_offset = (disk_sector - get_start_sect(bdev)) << SECTOR_SHIFT;
+ rc = bd_corrupted_range(bdev, bdev_offset, bdev_offset, len, data);
+
+ bdput(bdev);
+ return rc;
+}
+
/* see "strong" declaration in tools/testing/nvdimm/pmem-dax.c */
__weak long __pmem_direct_access(struct pmem_device *pmem, pgoff_t pgoff,
long nr_pages, void **kaddr, pfn_t *pfn)
@@ -281,6 +299,7 @@ static const struct block_device_operations pmem_fops = {
.owner = THIS_MODULE,
.submit_bio = pmem_submit_bio,
.rw_page = pmem_rw_page,
+ .corrupted_range = pmem_corrupted_range,
};
static int pmem_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff,
@@ -248,6 +248,7 @@ static inline void add_disk_no_queue_reg(struct gendisk *disk)
extern void del_gendisk(struct gendisk *gp);
extern struct block_device *bdget_disk(struct gendisk *disk, int partno);
+extern struct block_device *bdget_disk_sector(struct gendisk *disk, sector_t sector);
extern void set_disk_ro(struct gendisk *disk, int flag);
Obtain the superblock of a pmem disk, and call filesystem's ->corrupted_range() to handle the corrupted data. Signed-off-by: Shiyang Ruan <ruansy.fnst@cn.fujitsu.com> --- block/genhd.c | 6 ++++++ drivers/nvdimm/pmem.c | 19 +++++++++++++++++++ include/linux/genhd.h | 1 + 3 files changed, 26 insertions(+)