Jelajahi Sumber

libnvdimm, pmem: fix size trim in pmem_direct_access()

This masking prevents access to the end of the device via dax_do_io(),
and is unnecessary as arch_add_memory() would have rejected an unaligned
allocation.

Cc: <stable@vger.kernel.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Dan Williams 9 tahun lalu
induk
melakukan
589e75d157
1 mengubah file dengan 2 tambahan dan 13 penghapusan
  1. 2 13
      drivers/nvdimm/pmem.c

+ 2 - 13
drivers/nvdimm/pmem.c

@@ -105,22 +105,11 @@ static long pmem_direct_access(struct block_device *bdev, sector_t sector,
 {
 {
 	struct pmem_device *pmem = bdev->bd_disk->private_data;
 	struct pmem_device *pmem = bdev->bd_disk->private_data;
 	resource_size_t offset = sector * 512 + pmem->data_offset;
 	resource_size_t offset = sector * 512 + pmem->data_offset;
-	resource_size_t size;
-
-	if (pmem->data_offset) {
-		/*
-		 * Limit the direct_access() size to what is covered by
-		 * the memmap
-		 */
-		size = (pmem->size - offset) & ~ND_PFN_MASK;
-	} else
-		size = pmem->size - offset;
-
-	/* FIXME convert DAX to comprehend that this mapping has a lifetime */
+
 	*kaddr = pmem->virt_addr + offset;
 	*kaddr = pmem->virt_addr + offset;
 	*pfn = (pmem->phys_addr + offset) >> PAGE_SHIFT;
 	*pfn = (pmem->phys_addr + offset) >> PAGE_SHIFT;
 
 
-	return size;
+	return pmem->size - offset;
 }
 }
 
 
 static const struct block_device_operations pmem_fops = {
 static const struct block_device_operations pmem_fops = {