From 9d0e75668df2145b860ff3277721bbf862dfbc2c Mon Sep 17 00:00:00 2001 From: jollaman999 Date: Mon, 2 Oct 2017 03:18:31 +0900 Subject: f2fs: Fix merge errors Signed-off-by: Mister Oyster --- fs/f2fs/data.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'fs/f2fs/data.c') diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index b4b944224..2799fc3b9 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2120,12 +2120,14 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb, return err; } -void f2fs_invalidate_page(struct page *page, unsigned long offset) +void f2fs_invalidate_page(struct page *page, unsigned int offset, + unsigned int length) { struct inode *inode = page->mapping->host; struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - if (inode->i_ino >= F2FS_ROOT_INO(sbi) && (offset % PAGE_SIZE)) + if (inode->i_ino >= F2FS_ROOT_INO(sbi) && + (offset % PAGE_SIZE || length != PAGE_SIZE)) return; if (PageDirty(page)) { -- cgit v1.2.3