diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 17:23:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 17:23:06 -0500 |
| commit | fe803f862804065af4f856764cd85cafa01fe794 (patch) | |
| tree | 2636ab0c98268347a85398fe3830e95ff21440ed /fs/ext2 | |
| parent | ffefb181728f7b97df49ceba18cacfb6c5ee19f2 (diff) | |
| parent | f463589a7cd2d156e3b6b64ee26588c0cdcce08a (diff) | |
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/ext2')
| -rw-r--r-- | fs/ext2/super.c | 2 |
1 files changed, 1 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) | |||
| 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 | } |