Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+6 -1
+1 -1
fs/ext2/super.c
··· 1231 1231 * write and hope for the best. 1232 1232 */ 1233 1233 ext2_msg(sb, KERN_ERR, 1234 - "previous I/O error to superblock detected\n"); 1234 + "previous I/O error to superblock detected"); 1235 1235 clear_buffer_write_io_error(sbh); 1236 1236 set_buffer_uptodate(sbh); 1237 1237 }
+5
fs/udf/udftime.c
··· 62 62 dest->tv_sec -= offset * 60; 63 63 dest->tv_nsec = 1000 * (src.centiseconds * 10000 + 64 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 70 return dest; 66 71 } 67 72