diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-02-16 18:59:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 20:56:03 -0500 |
| commit | 4c0ccfef2e9f7418a6eb0bf07a2fc8f216365b18 (patch) | |
| tree | ca1c0bebddf210eab5e5428bb0416d6bfc71495b /include/linux | |
| parent | f7ca90b160307d63aaedab8bd451c24a182db20f (diff) | |
dax,ext2: replace xip_truncate_page with dax_truncate_page
It takes a get_block parameter just like nobh_truncate_page() and
block_truncate_page()
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Boaz Harrosh <boaz@plexistor.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 6bad6d4c579b..2c8f9055af38 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
| @@ -2591,18 +2591,10 @@ extern int nonseekable_open(struct inode * inode, struct file * filp); | |||
| 2591 | ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *, | 2591 | ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *, |
| 2592 | loff_t, get_block_t, dio_iodone_t, int flags); | 2592 | loff_t, get_block_t, dio_iodone_t, int flags); |
| 2593 | int dax_clear_blocks(struct inode *, sector_t block, long size); | 2593 | int dax_clear_blocks(struct inode *, sector_t block, long size); |
| 2594 | int dax_truncate_page(struct inode *, loff_t from, get_block_t); | ||
| 2594 | int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t); | 2595 | int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t); |
| 2595 | #define dax_mkwrite(vma, vmf, gb) dax_fault(vma, vmf, gb) | 2596 | #define dax_mkwrite(vma, vmf, gb) dax_fault(vma, vmf, gb) |
| 2596 | 2597 | ||
| 2597 | #ifdef CONFIG_FS_XIP | ||
| 2598 | extern int xip_truncate_page(struct address_space *mapping, loff_t from); | ||
| 2599 | #else | ||
| 2600 | static inline int xip_truncate_page(struct address_space *mapping, loff_t from) | ||
| 2601 | { | ||
| 2602 | return 0; | ||
| 2603 | } | ||
| 2604 | #endif | ||
| 2605 | |||
| 2606 | #ifdef CONFIG_BLOCK | 2598 | #ifdef CONFIG_BLOCK |
| 2607 | typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, | 2599 | typedef void (dio_submit_t)(int rw, struct bio *bio, struct inode *inode, |
| 2608 | loff_t file_offset); | 2600 | loff_t file_offset); |
