diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-08 01:23:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-08 01:23:06 +0300 |
| commit | fe803f862804065af4f856764cd85cafa01fe794 (patch) | |
| tree | 2636ab0c98268347a85398fe3830e95ff21440ed /fs | |
| parent | ffefb181728f7b97df49ceba18cacfb6c5ee19f2 (diff) | |
| parent | f463589a7cd2d156e3b6b64ee26588c0cdcce08a (diff) | |
| download | linux-fe803f862804065af4f856764cd85cafa01fe794.tar.xz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF and ext2 fixlets from Jan Kara:
"A UDF fix and an ext2 cleanup"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2: drop unneeded newline
udf: Sanitize nanoseconds for time stamps
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext2/super.c | 2 | ||||
| -rw-r--r-- | fs/udf/udftime.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 0a638e79bf7c..7666c065b96f 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1231,7 +1231,7 @@ static void ext2_clear_super_error(struct super_block *sb) * write and hope for the best. */ ext2_msg(sb, KERN_ERR, - "previous I/O error to superblock detected\n"); + "previous I/O error to superblock detected"); clear_buffer_write_io_error(sbh); set_buffer_uptodate(sbh); } diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c index 14626b34d13e..0927a4b2ecaf 100644 --- a/fs/udf/udftime.c +++ b/fs/udf/udftime.c @@ -62,6 +62,11 @@ udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src) dest->tv_sec -= offset * 60; dest->tv_nsec = 1000 * (src.centiseconds * 10000 + src.hundredsOfMicroseconds * 100 + src.microseconds); + /* + * Sanitize nanosecond field since reportedly some filesystems are + * recorded with bogus sub-second values. + */ + dest->tv_nsec %= NSEC_PER_SEC; return dest; } |