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/f2fs/sysfs.c | |
| parent | 3515b7df16dda84ed79cef8d5c1efc0ff9a9c4e3 (diff) | |
f2fs: Fix merge errors
Signed-off-by: Mister Oyster <oysterized@gmail.com>
Diffstat (limited to 'fs/f2fs/sysfs.c')
| -rw-r--r-- | fs/f2fs/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |