| Message ID | 20200226041002.13914-1-yangerkun@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ext4: using matching invalidatepage in ext4_writepage | expand |
On 2/26/20 9:40 AM, yangerkun wrote: > Run generic/388 with journal data mode sometimes may trigger the warning > in ext4_invalidatepage. Actually, we should use the matching invalidatepage > in ext4_writepage. > > Signed-off-by: yangerkun <yangerkun@huawei.com> generic/388 still fails, but the patch makes sense to me and also avoids kernel warning. Reviewed-by: Ritesh Harjani <riteshh@linux.ibm.com> > --- > fs/ext4/inode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index fa0ff78dc033..78e805d42ada 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -1974,7 +1974,7 @@ static int ext4_writepage(struct page *page, > bool keep_towrite = false; > > if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) { > - ext4_invalidatepage(page, 0, PAGE_SIZE); > + inode->i_mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); > unlock_page(page); > return -EIO; > } >
On Wed 26-02-20 12:10:02, yangerkun wrote: > Run generic/388 with journal data mode sometimes may trigger the warning > in ext4_invalidatepage. Actually, we should use the matching invalidatepage > in ext4_writepage. > > Signed-off-by: yangerkun <yangerkun@huawei.com> Thanks for the patch! It looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index fa0ff78dc033..78e805d42ada 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -1974,7 +1974,7 @@ static int ext4_writepage(struct page *page, > bool keep_towrite = false; > > if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) { > - ext4_invalidatepage(page, 0, PAGE_SIZE); > + inode->i_mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); > unlock_page(page); > return -EIO; > } > -- > 2.23.0.rc2.8.gff66981f45 >
Hi, Ted, can you consider to apply this patch. On 2020/2/26 12:10, yangerkun wrote: > Run generic/388 with journal data mode sometimes may trigger the warning > in ext4_invalidatepage. Actually, we should use the matching invalidatepage > in ext4_writepage. > > Signed-off-by: yangerkun <yangerkun@huawei.com> > --- > fs/ext4/inode.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c > index fa0ff78dc033..78e805d42ada 100644 > --- a/fs/ext4/inode.c > +++ b/fs/ext4/inode.c > @@ -1974,7 +1974,7 @@ static int ext4_writepage(struct page *page, > bool keep_towrite = false; > > if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) { > - ext4_invalidatepage(page, 0, PAGE_SIZE); > + inode->i_mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); > unlock_page(page); > return -EIO; > }
On Wed, Feb 26, 2020 at 12:10:02PM +0800, yangerkun wrote: > Run generic/388 with journal data mode sometimes may trigger the warning > in ext4_invalidatepage. Actually, we should use the matching invalidatepage > in ext4_writepage. > > Signed-off-by: yangerkun <yangerkun@huawei.com> Applied, thanks. Apologies for overlooking this patch earlier. - Ted
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index fa0ff78dc033..78e805d42ada 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1974,7 +1974,7 @@ static int ext4_writepage(struct page *page, bool keep_towrite = false; if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb)))) { - ext4_invalidatepage(page, 0, PAGE_SIZE); + inode->i_mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE); unlock_page(page); return -EIO; }
Run generic/388 with journal data mode sometimes may trigger the warning in ext4_invalidatepage. Actually, we should use the matching invalidatepage in ext4_writepage. Signed-off-by: yangerkun <yangerkun@huawei.com> --- fs/ext4/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)