1 ext4: remove trailing \n from ext4_warning/ext4_error calls
3 From: Jakub Wilk <jwilk@jwilk.net>
5 Messages passed to ext4_warning() or ext4_error() don't need trailing
6 newlines, because these function add the newlines themselves.
8 Signed-off-by: Jakub Wilk <jwilk@jwilk.net>
10 fs/ext4/extents.c | 4 ++--
11 fs/ext4/extents_status.c | 2 +-
13 fs/ext4/inline.c | 2 +-
14 fs/ext4/mballoc.c | 2 +-
15 fs/ext4/mmp.c | 4 ++--
16 fs/ext4/namei.c | 2 +-
17 fs/ext4/resize.c | 2 +-
18 8 files changed, 10 insertions(+), 10 deletions(-)
20 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
21 index 95bf467..d09855b 100644
22 --- a/fs/ext4/extents.c
23 +++ b/fs/ext4/extents.c
24 @@ -2583,7 +2583,7 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode,
27 ext4_error(sbi->s_sb, "strange request: removal(2) "
28 - "%u-%u from %u:%u\n",
30 from, to, le32_to_cpu(ex->ee_block), ee_len);
33 @@ -3738,7 +3738,7 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,
34 if (ee_block != map->m_lblk || ee_len > map->m_len) {
36 ext4_warning("Inode (%ld) finished: extent logical block %llu,"
37 - " len %u; IO logical block %llu, len %u\n",
38 + " len %u; IO logical block %llu, len %u",
39 inode->i_ino, (unsigned long long)ee_block, ee_len,
40 (unsigned long long)map->m_lblk, map->m_len);
42 diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c
43 index e38b987a..37e0592 100644
44 --- a/fs/ext4/extents_status.c
45 +++ b/fs/ext4/extents_status.c
46 @@ -707,7 +707,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
47 (status & EXTENT_STATUS_WRITTEN)) {
48 ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
49 " delayed and written which can potentially "
50 - " cause data loss.\n", lblk, len);
51 + " cause data loss.", lblk, len);
55 diff --git a/fs/ext4/file.c b/fs/ext4/file.c
56 index fa2208b..3e850b9 100644
59 @@ -378,7 +378,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
60 if (ext4_encrypted_inode(d_inode(dir)) &&
61 !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
62 ext4_warning(inode->i_sb,
63 - "Inconsistent encryption contexts: %lu/%lu\n",
64 + "Inconsistent encryption contexts: %lu/%lu",
65 (unsigned long) d_inode(dir)->i_ino,
66 (unsigned long) inode->i_ino);
68 diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
69 index 7bc6c85..ff7538c 100644
70 --- a/fs/ext4/inline.c
71 +++ b/fs/ext4/inline.c
72 @@ -1780,7 +1780,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
73 ext4_warning(dir->i_sb,
74 "bad inline directory (dir #%lu) - "
75 "inode %u, rec_len %u, name_len %d"
78 dir->i_ino, le32_to_cpu(de->inode),
79 le16_to_cpu(de->rec_len), de->name_len,
81 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
82 index eeeade7..efa111a 100644
83 --- a/fs/ext4/mballoc.c
84 +++ b/fs/ext4/mballoc.c
85 @@ -4935,7 +4935,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
88 if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) {
89 - ext4_warning(sb, "too much blocks added to group %u\n",
90 + ext4_warning(sb, "too much blocks added to group %u",
94 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
95 index 2444527..23d436d 100644
98 @@ -121,7 +121,7 @@ void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
99 __ext4_warning(sb, function, line, "%s", msg);
100 __ext4_warning(sb, function, line,
101 "MMP failure info: last update time: %llu, last update "
102 - "node: %s, last update device: %s\n",
103 + "node: %s, last update device: %s",
104 (long long unsigned int) le64_to_cpu(mmp->mmp_time),
105 mmp->mmp_nodename, mmp->mmp_bdevname);
107 @@ -353,7 +353,7 @@ skip:
108 * wait for MMP interval and check mmp_seq.
110 if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
111 - ext4_warning(sb, "MMP startup interrupted, failing mount\n");
112 + ext4_warning(sb, "MMP startup interrupted, failing mount");
116 diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
117 index 48e4b89..9025064 100644
118 --- a/fs/ext4/namei.c
119 +++ b/fs/ext4/namei.c
120 @@ -1613,7 +1613,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
122 return ERR_PTR(-ENOKEY);
123 ext4_warning(inode->i_sb,
124 - "Inconsistent encryption contexts: %lu/%lu\n",
125 + "Inconsistent encryption contexts: %lu/%lu",
126 (unsigned long) dir->i_ino,
127 (unsigned long) inode->i_ino);
128 return ERR_PTR(-EPERM);
129 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
130 index 34038e3..cf68100 100644
131 --- a/fs/ext4/resize.c
132 +++ b/fs/ext4/resize.c
133 @@ -41,7 +41,7 @@ int ext4_resize_begin(struct super_block *sb)
135 if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
136 ext4_warning(sb, "There are errors in the filesystem, "
137 - "so online resizing is not allowed\n");
138 + "so online resizing is not allowed");