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
Unified · Split
| @@ -1231,7 +1231,7 @@ static void ext2_clear_super_error(struct super_block *sb) · 1230 unmodified lines | |||
| 1231 | * write and hope for the best. | 1231 | * write and hope for the best. |
| 1232 | */ | 1232 | */ |
| 1233 | ext2_msg(sb, KERN_ERR, | 1233 | ext2_msg(sb, KERN_ERR, |
| 1234 | "previous I/O error to superblock detected\n"); | 1234 | "previous I/O error to superblock detected"); |
| 1235 | clear_buffer_write_io_error(sbh); | 1235 | clear_buffer_write_io_error(sbh); |
| 1236 | set_buffer_uptodate(sbh); | 1236 | set_buffer_uptodate(sbh); |
| 1237 | } | 1237 | } |
| @@ -62,6 +62,11 @@ udf_disk_stamp_to_time(struct timespec *dest, struct timestamp src) · 61 unmodified lines | |||
| 62 | dest->tv_sec -= offset * 60; | 62 | dest->tv_sec -= offset * 60; |
| 63 | dest->tv_nsec = 1000 * (src.centiseconds * 10000 + | 63 | dest->tv_nsec = 1000 * (src.centiseconds * 10000 + |
| 64 | src.hundredsOfMicroseconds * 100 + src.microseconds); | 64 | src.hundredsOfMicroseconds * 100 + src.microseconds); |
| 65 | /* | ||
| 66 | * Sanitize nanosecond field since reportedly some filesystems are | ||
| 67 | * recorded with bogus sub-second values. | ||
| 68 | */ | ||
| 69 | dest->tv_nsec %= NSEC_PER_SEC; | ||
| 65 | return dest; | 70 | return dest; |
| 66 | } | 71 | } |
| 67 | 72 | ||