diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 11:43:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-07 11:43:32 -0700 |
| commit | d8456eaf319a27d33186f1091bc1ff5c59cf0f0d (patch) | |
| tree | 7c02bd661997630ec0275bd04a4f79876f5dea24 /fs/internal.h | |
| parent | Merge tag 'jfs-5.2' of git://github.com/kleikamp/linux-shaggy (diff) | |
| parent | iomap: move iomap_read_inline_data around (diff) | |
| download | linux-dev-d8456eaf319a27d33186f1091bc1ff5c59cf0f0d.tar.xz linux-dev-d8456eaf319a27d33186f1091bc1ff5c59cf0f0d.zip | |
Merge tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull iomap updates from Darrick Wong:
"Nothing particularly exciting here, just adding some callouts for gfs2
and cleaning a few things.
Summary:
- Add some extra hooks to the iomap buffered write path to enable
gfs2 journalled writes
- SPDX conversion
- Various refactoring"
* tag 'iomap-5.2-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: move iomap_read_inline_data around
iomap: Add a page_prepare callback
iomap: Fix use-after-free error in page_done callback
fs: Turn __generic_write_end into a void function
iomap: Clean up __generic_write_end calling
iomap: convert to SPDX identifier
Diffstat (limited to 'fs/internal.h')
| -rw-r--r-- | fs/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/internal.h b/fs/internal.h index 2e7362837a6e..82b78aec1ce9 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -44,7 +44,7 @@ static inline int __sync_blockdev(struct block_device *bdev, int wait) extern void guard_bio_eod(int rw, struct bio *bio); extern int __block_write_begin_int(struct page *page, loff_t pos, unsigned len, get_block_t *get_block, struct iomap *iomap); -int __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, +void __generic_write_end(struct inode *inode, loff_t pos, unsigned copied, struct page *page); /* |