diff options
| author | jollaman999 <admin@jollaman999.com> | 2017-10-02 03:18:31 +0900 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-10-04 18:52:53 +0200 |
| commit | 9d0e75668df2145b860ff3277721bbf862dfbc2c (patch) | |
| tree | 0a942e79fb30b57dbdd7f2cdf00ecf9090a85a4a /fs | |
| parent | 3515b7df16dda84ed79cef8d5c1efc0ff9a9c4e3 (diff) | |
f2fs: Fix merge errors
Signed-off-by: Mister Oyster <oysterized@gmail.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/data.c | 6 | ||||
| -rw-r--r-- | fs/f2fs/super.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/sysfs.c | 2 |
3 files changed, 6 insertions, 4 deletions
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)) { diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 82044783d..197de5434 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2580,7 +2580,7 @@ free_meta: * followed by write_checkpoint() through f2fs_write_node_pages(), which * falls into an infinite loop in sync_meta_pages(). */ - truncate_inode_pages_final(META_MAPPING(sbi), 0); + truncate_inode_pages_final(META_MAPPING(sbi)); free_sysfs: f2fs_unregister_sysfs(sbi); free_root_inode: diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c index 06fda7cc7..6269e54a2 100644 --- a/fs/f2fs/sysfs.c +++ b/fs/f2fs/sysfs.c @@ -436,7 +436,7 @@ static int iostat_info_seq_show(struct seq_file *seq, void *offset) { struct super_block *sb = seq->private; struct f2fs_sb_info *sbi = F2FS_SB(sb); - time64_t now = get_seconds(); + __s64 now = get_seconds(); if (!sbi->iostat_enable) return 0; |