Skip to content

Commit 5780a02

Browse files
Souptick Joardertorvalds
authored andcommitted
fs/iomap.c: change return type to vm_fault_t
Change iomap_page_mkwrite() return type to vm_fault_t. see commit 1c8f422 ("mm: change return type to vm_fault_t") for reference. Link: http://lkml.kernel.org/r/20180827172050.GA18673@jordon-HP-15-Notebook-PC Signed-off-by: Souptick Joarder <[email protected]> Reviewed-by: Matthew Wilcox <[email protected]> Cc: Matthew Wilcox <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 867632d commit 5780a02

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

fs/iomap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ iomap_page_mkwrite_actor(struct inode *inode, loff_t pos, loff_t length,
10571057
return length;
10581058
}
10591059

1060-
int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
1060+
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops)
10611061
{
10621062
struct page *page = vmf->page;
10631063
struct inode *inode = file_inode(vmf->vma->vm_file);

include/linux/iomap.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/bitmap.h>
77
#include <linux/mm.h>
88
#include <linux/types.h>
9+
#include <linux/mm_types.h>
910

1011
struct address_space;
1112
struct fiemap_extent_info;
@@ -141,7 +142,8 @@ int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len,
141142
bool *did_zero, const struct iomap_ops *ops);
142143
int iomap_truncate_page(struct inode *inode, loff_t pos, bool *did_zero,
143144
const struct iomap_ops *ops);
144-
int iomap_page_mkwrite(struct vm_fault *vmf, const struct iomap_ops *ops);
145+
vm_fault_t iomap_page_mkwrite(struct vm_fault *vmf,
146+
const struct iomap_ops *ops);
145147
int iomap_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
146148
loff_t start, loff_t len, const struct iomap_ops *ops);
147149
loff_t iomap_seek_hole(struct inode *inode, loff_t offset,

0 commit comments

Comments
 (0)