diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2015-08-18 15:55:41 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-20 14:07:24 -0400 |
commit | e2e05394e4a3420dab96f728df4531893494e15d (patch) | |
tree | ba7d067880cf626ca90856ad6ba703b8c99fc276 /Documentation/filesystems/Locking | |
parent | 2765cfbb342c727c3fd47b165196cb16da158022 (diff) |
pmem, dax: have direct_access use __pmem annotation
Update the annotation for the kaddr pointer returned by direct_access()
so that it is a __pmem pointer. This is consistent with the PMEM driver
and with how this direct_access() pointer is used in the DAX code.
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'Documentation/filesystems/Locking')
-rw-r--r-- | Documentation/filesystems/Locking | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 6a34a0f4d37c..06d443450f21 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
@@ -397,7 +397,8 @@ prototypes: | |||
397 | int (*release) (struct gendisk *, fmode_t); | 397 | int (*release) (struct gendisk *, fmode_t); |
398 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 398 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
399 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 399 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
400 | int (*direct_access) (struct block_device *, sector_t, void **, unsigned long *); | 400 | int (*direct_access) (struct block_device *, sector_t, void __pmem **, |
401 | unsigned long *); | ||
401 | int (*media_changed) (struct gendisk *); | 402 | int (*media_changed) (struct gendisk *); |
402 | void (*unlock_native_capacity) (struct gendisk *); | 403 | void (*unlock_native_capacity) (struct gendisk *); |
403 | int (*revalidate_disk) (struct gendisk *); | 404 | int (*revalidate_disk) (struct gendisk *); |