Skip to content

Commit cb389b9

Browse files
committed
dax: drop size parameter to ->direct_access()
None of the implementations currently use it. The common bdev_direct_access() entry point handles all the size checks before calling ->direct_access(). Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Dan Williams <[email protected]>
1 parent 4a9bf88 commit cb389b9

File tree

6 files changed

+7
-11
lines changed

6 files changed

+7
-11
lines changed

arch/powerpc/sysdev/axonram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)
141141
*/
142142
static long
143143
axon_ram_direct_access(struct block_device *device, sector_t sector,
144-
void __pmem **kaddr, unsigned long *pfn, long size)
144+
void __pmem **kaddr, unsigned long *pfn)
145145
{
146146
struct axon_ram_bank *bank = device->bd_disk->private_data;
147147
loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT;

drivers/block/brd.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int brd_rw_page(struct block_device *bdev, sector_t sector,
371371

372372
#ifdef CONFIG_BLK_DEV_RAM_DAX
373373
static long brd_direct_access(struct block_device *bdev, sector_t sector,
374-
void __pmem **kaddr, unsigned long *pfn, long size)
374+
void __pmem **kaddr, unsigned long *pfn)
375375
{
376376
struct brd_device *brd = bdev->bd_disk->private_data;
377377
struct page *page;
@@ -384,10 +384,6 @@ static long brd_direct_access(struct block_device *bdev, sector_t sector,
384384
*kaddr = (void __pmem *)page_address(page);
385385
*pfn = page_to_pfn(page);
386386

387-
/*
388-
* TODO: If size > PAGE_SIZE, we could look to see if the next page in
389-
* the file happens to be mapped to the next page of physical RAM.
390-
*/
391387
return PAGE_SIZE;
392388
}
393389
#else

drivers/nvdimm/pmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
9292
}
9393

9494
static long pmem_direct_access(struct block_device *bdev, sector_t sector,
95-
void __pmem **kaddr, unsigned long *pfn, long size)
95+
void __pmem **kaddr, unsigned long *pfn)
9696
{
9797
struct pmem_device *pmem = bdev->bd_disk->private_data;
9898
size_t offset = sector << 9;

drivers/s390/block/dcssblk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static int dcssblk_open(struct block_device *bdev, fmode_t mode);
2929
static void dcssblk_release(struct gendisk *disk, fmode_t mode);
3030
static void dcssblk_make_request(struct request_queue *q, struct bio *bio);
3131
static long dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
32-
void __pmem **kaddr, unsigned long *pfn, long size);
32+
void __pmem **kaddr, unsigned long *pfn);
3333

3434
static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0";
3535

@@ -879,7 +879,7 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
879879

880880
static long
881881
dcssblk_direct_access (struct block_device *bdev, sector_t secnum,
882-
void __pmem **kaddr, unsigned long *pfn, long size)
882+
void __pmem **kaddr, unsigned long *pfn)
883883
{
884884
struct dcssblk_dev_info *dev_info;
885885
unsigned long offset, dev_sz;

fs/block_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ long bdev_direct_access(struct block_device *bdev, sector_t sector,
462462
sector += get_start_sect(bdev);
463463
if (sector % (PAGE_SIZE / 512))
464464
return -EINVAL;
465-
avail = ops->direct_access(bdev, sector, addr, pfn, size);
465+
avail = ops->direct_access(bdev, sector, addr, pfn);
466466
if (!avail)
467467
return -ERANGE;
468468
return min(avail, size);

include/linux/blkdev.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ struct block_device_operations {
15561556
int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
15571557
int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
15581558
long (*direct_access)(struct block_device *, sector_t, void __pmem **,
1559-
unsigned long *pfn, long size);
1559+
unsigned long *pfn);
15601560
unsigned int (*check_events) (struct gendisk *disk,
15611561
unsigned int clearing);
15621562
/* ->media_changed() is DEPRECATED, use ->check_events() instead */

0 commit comments

Comments
 (0)