diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 11:05:44 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-07-24 11:05:44 -0400 |
| commit | 0606263f24f3d64960de742c55894190b5df903b (patch) | |
| tree | 673894f227c1a761f601ad7bdc1ceef003bb85cb /Documentation/filesystems/Locking | |
| parent | a72255983f12f31f0c8d8275fb1a781546cfacb7 (diff) | |
| parent | d4c5725d57323e2348940fcc6416072671a9b432 (diff) | |
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
Diffstat (limited to 'Documentation/filesystems/Locking')
| -rw-r--r-- | Documentation/filesystems/Locking | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index 75eea7ce3d7c..d9c37ec4c760 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking | |||
| @@ -395,7 +395,7 @@ prototypes: | |||
| 395 | int (*release) (struct gendisk *, fmode_t); | 395 | int (*release) (struct gendisk *, fmode_t); |
| 396 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 396 | int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
| 397 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); | 397 | int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); |
| 398 | int (*direct_access) (struct block_device *, sector_t, void __pmem **, | 398 | int (*direct_access) (struct block_device *, sector_t, void **, |
| 399 | unsigned long *); | 399 | unsigned long *); |
| 400 | int (*media_changed) (struct gendisk *); | 400 | int (*media_changed) (struct gendisk *); |
| 401 | void (*unlock_native_capacity) (struct gendisk *); | 401 | void (*unlock_native_capacity) (struct gendisk *); |