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
This commit is contained in:
Коммит
fe803f8628
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче