Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

fe803f86 · Linus Torvalds <[email protected]> · 2018-02-07 14:23:06 -08:00

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

Commit: fe803f862804065af4f856764cd85cafa01fe794
Parents: ffefb181 · f463589a

Merge commit. Changes below are compared with the first parent: ffefb181.

Changes

2 files changed · +6 −1

File	Status	Add	Del	Content
fs/ext2/super.c	modified	+1	−1	View file
fs/udf/udftime.c	modified	+5	−0	View file

fs/ext2/super.c

View file

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 0a638e7..7666c06 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);
 	}

fs/udf/udftime.c

View file

diff --git a/fs/udf/udftime.c b/fs/udf/udftime.c
index 14626b3..0927a4b 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;
 }
 