Skip to content

Commit 8d2ae1c

Browse files
jwilktytso
authored andcommitted
ext4: remove trailing \n from ext4_warning/ext4_error calls
Messages passed to ext4_warning() or ext4_error() don't need trailing newlines, because these function add the newlines themselves. Signed-off-by: Jakub Wilk <[email protected]>
1 parent c8585c6 commit 8d2ae1c

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

fs/ext4/extents.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,7 +2588,7 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode,
25882588
}
25892589
} else
25902590
ext4_error(sbi->s_sb, "strange request: removal(2) "
2591-
"%u-%u from %u:%u\n",
2591+
"%u-%u from %u:%u",
25922592
from, to, le32_to_cpu(ex->ee_block), ee_len);
25932593
return 0;
25942594
}
@@ -3743,7 +3743,7 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,
37433743
if (ee_block != map->m_lblk || ee_len > map->m_len) {
37443744
#ifdef EXT4_DEBUG
37453745
ext4_warning("Inode (%ld) finished: extent logical block %llu,"
3746-
" len %u; IO logical block %llu, len %u\n",
3746+
" len %u; IO logical block %llu, len %u",
37473747
inode->i_ino, (unsigned long long)ee_block, ee_len,
37483748
(unsigned long long)map->m_lblk, map->m_len);
37493749
#endif

fs/ext4/extents_status.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
707707
(status & EXTENT_STATUS_WRITTEN)) {
708708
ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
709709
" delayed and written which can potentially "
710-
" cause data loss.\n", lblk, len);
710+
" cause data loss.", lblk, len);
711711
WARN_ON(1);
712712
}
713713

fs/ext4/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
378378
if (ext4_encrypted_inode(d_inode(dir)) &&
379379
!ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
380380
ext4_warning(inode->i_sb,
381-
"Inconsistent encryption contexts: %lu/%lu\n",
381+
"Inconsistent encryption contexts: %lu/%lu",
382382
(unsigned long) d_inode(dir)->i_ino,
383383
(unsigned long) inode->i_ino);
384384
dput(dir);

fs/ext4/inline.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
17801780
ext4_warning(dir->i_sb,
17811781
"bad inline directory (dir #%lu) - "
17821782
"inode %u, rec_len %u, name_len %d"
1783-
"inline size %d\n",
1783+
"inline size %d",
17841784
dir->i_ino, le32_to_cpu(de->inode),
17851785
le16_to_cpu(de->rec_len), de->name_len,
17861786
inline_size);

fs/ext4/mballoc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4935,7 +4935,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
49354935
* boundary.
49364936
*/
49374937
if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) {
4938-
ext4_warning(sb, "too much blocks added to group %u\n",
4938+
ext4_warning(sb, "too much blocks added to group %u",
49394939
block_group);
49404940
err = -EINVAL;
49414941
goto error_return;

fs/ext4/mmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
121121
__ext4_warning(sb, function, line, "%s", msg);
122122
__ext4_warning(sb, function, line,
123123
"MMP failure info: last update time: %llu, last update "
124-
"node: %s, last update device: %s\n",
124+
"node: %s, last update device: %s",
125125
(long long unsigned int) le64_to_cpu(mmp->mmp_time),
126126
mmp->mmp_nodename, mmp->mmp_bdevname);
127127
}
@@ -353,7 +353,7 @@ int ext4_multi_mount_protect(struct super_block *sb,
353353
* wait for MMP interval and check mmp_seq.
354354
*/
355355
if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
356-
ext4_warning(sb, "MMP startup interrupted, failing mount\n");
356+
ext4_warning(sb, "MMP startup interrupted, failing mount");
357357
goto failed;
358358
}
359359

fs/ext4/namei.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
16181618
if (nokey)
16191619
return ERR_PTR(-ENOKEY);
16201620
ext4_warning(inode->i_sb,
1621-
"Inconsistent encryption contexts: %lu/%lu\n",
1621+
"Inconsistent encryption contexts: %lu/%lu",
16221622
(unsigned long) dir->i_ino,
16231623
(unsigned long) inode->i_ino);
16241624
return ERR_PTR(-EPERM);

fs/ext4/resize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int ext4_resize_begin(struct super_block *sb)
4141
*/
4242
if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
4343
ext4_warning(sb, "There are errors in the filesystem, "
44-
"so online resizing is not allowed\n");
44+
"so online resizing is not allowed");
4545
return -EPERM;
4646
}
4747

0 commit comments

Comments
 (0)