| Message ID | 20180414193342.GA19956@jordon-HP-15-Notebook-PC |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | fs: ext2: Adding new return type vm_fault_t | expand |
On Sun 15-04-18 01:03:42, Souptick Joarder wrote: > Use new return type vm_fault_t for page_mkwrite, > pfn_mkwrite and fault handler. > > Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com> > Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com> > --- > fs/ext2/file.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks for the patch. I've added it to my tree. Honza > > diff --git a/fs/ext2/file.c b/fs/ext2/file.c > index 0964022..047c327 100644 > --- a/fs/ext2/file.c > +++ b/fs/ext2/file.c > @@ -88,11 +88,11 @@ static ssize_t ext2_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) > * The default page_lock and i_size verification done by non-DAX fault paths > * is sufficient because ext2 doesn't support hole punching. > */ > -static int ext2_dax_fault(struct vm_fault *vmf) > +static vm_fault_t ext2_dax_fault(struct vm_fault *vmf) > { > struct inode *inode = file_inode(vmf->vma->vm_file); > struct ext2_inode_info *ei = EXT2_I(inode); > - int ret; > + vm_fault_t ret; > > if (vmf->flags & FAULT_FLAG_WRITE) { > sb_start_pagefault(inode->i_sb); > -- > 1.9.1 > >
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 0964022..047c327 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c @@ -88,11 +88,11 @@ static ssize_t ext2_dax_write_iter(struct kiocb *iocb, struct iov_iter *from) * The default page_lock and i_size verification done by non-DAX fault paths * is sufficient because ext2 doesn't support hole punching. */ -static int ext2_dax_fault(struct vm_fault *vmf) +static vm_fault_t ext2_dax_fault(struct vm_fault *vmf) { struct inode *inode = file_inode(vmf->vma->vm_file); struct ext2_inode_info *ei = EXT2_I(inode); - int ret; + vm_fault_t ret; if (vmf->flags & FAULT_FLAG_WRITE) { sb_start_pagefault(inode->i_sb);