moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext4: remove trailing \n from ext4_warning/ext4_error calls

Browse Source 
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 <jwilk@jwilk.net>
This commit is contained in:
Jakub Wilk
2016-04-27 01:11:21 -04:00
committed by Theodore Ts'o
parent c8585c6fca
commit 8d2ae1cbe8
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ext4/extents.c
View File

@@ -2588,7 +2588,7 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode,
} }
} else } else
ext4_error(sbi->s_sb, "strange request: removal(2) " ext4_error(sbi->s_sb, "strange request: removal(2) "
"%u-%u from %u:%u\n", "%u-%u from %u:%u",
from, to, le32_to_cpu(ex->ee_block), ee_len); from, to, le32_to_cpu(ex->ee_block), ee_len);
return 0; return 0;
} }
@@ -3743,7 +3743,7 @@ static int ext4_convert_unwritten_extents_endio(handle_t *handle,
if (ee_block != map->m_lblk || ee_len > map->m_len) { if (ee_block != map->m_lblk || ee_len > map->m_len) {
#ifdef EXT4_DEBUG #ifdef EXT4_DEBUG
ext4_warning("Inode (%ld) finished: extent logical block %llu," ext4_warning("Inode (%ld) finished: extent logical block %llu,"
" len %u; IO logical block %llu, len %u\n", " len %u; IO logical block %llu, len %u",
inode->i_ino, (unsigned long long)ee_block, ee_len, inode->i_ino, (unsigned long long)ee_block, ee_len,
(unsigned long long)map->m_lblk, map->m_len); (unsigned long long)map->m_lblk, map->m_len);
#endif #endif

2
fs/ext4/extents_status.c
View File

@@ -707,7 +707,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
(status & EXTENT_STATUS_WRITTEN)) { (status & EXTENT_STATUS_WRITTEN)) {
ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as " ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
" delayed and written which can potentially " " delayed and written which can potentially "
" cause data loss.\n", lblk, len); " cause data loss.", lblk, len);
WARN_ON(1); WARN_ON(1);
} }

2
fs/ext4/file.c
View File

@@ -378,7 +378,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
if (ext4_encrypted_inode(d_inode(dir)) && if (ext4_encrypted_inode(d_inode(dir)) &&
!ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) { !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
ext4_warning(inode->i_sb, ext4_warning(inode->i_sb,
"Inconsistent encryption contexts: %lu/%lu\n", "Inconsistent encryption contexts: %lu/%lu",
(unsigned long) d_inode(dir)->i_ino, (unsigned long) d_inode(dir)->i_ino,
(unsigned long) inode->i_ino); (unsigned long) inode->i_ino);
dput(dir); dput(dir);

2
fs/ext4/inline.c
View File

@@ -1780,7 +1780,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
ext4_warning(dir->i_sb, ext4_warning(dir->i_sb,
"bad inline directory (dir #%lu) - " "bad inline directory (dir #%lu) - "
"inode %u, rec_len %u, name_len %d" "inode %u, rec_len %u, name_len %d"
"inline size %d\n", "inline size %d",
dir->i_ino, le32_to_cpu(de->inode), dir->i_ino, le32_to_cpu(de->inode),
le16_to_cpu(de->rec_len), de->name_len, le16_to_cpu(de->rec_len), de->name_len,
inline_size); inline_size);

2
fs/ext4/mballoc.c
View File

@@ -4935,7 +4935,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
* boundary. * boundary.
*/ */
if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) { if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) {
ext4_warning(sb, "too much blocks added to group %u\n", ext4_warning(sb, "too much blocks added to group %u",
block_group); block_group);
err = -EINVAL; err = -EINVAL;
goto error_return; goto error_return;

4
fs/ext4/mmp.c
View File

@@ -121,7 +121,7 @@ void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
__ext4_warning(sb, function, line, "%s", msg); __ext4_warning(sb, function, line, "%s", msg);
__ext4_warning(sb, function, line, __ext4_warning(sb, function, line,
"MMP failure info: last update time: %llu, last update " "MMP failure info: last update time: %llu, last update "
"node: %s, last update device: %s\n", "node: %s, last update device: %s",
(long long unsigned int) le64_to_cpu(mmp->mmp_time), (long long unsigned int) le64_to_cpu(mmp->mmp_time),
mmp->mmp_nodename, mmp->mmp_bdevname); mmp->mmp_nodename, mmp->mmp_bdevname);
} }
@@ -353,7 +353,7 @@ skip:
* wait for MMP interval and check mmp_seq. * wait for MMP interval and check mmp_seq.
*/ */
if (schedule_timeout_interruptible(HZ * wait_time) != 0) { if (schedule_timeout_interruptible(HZ * wait_time) != 0) {
ext4_warning(sb, "MMP startup interrupted, failing mount\n"); ext4_warning(sb, "MMP startup interrupted, failing mount");
goto failed; goto failed;
} }

2
fs/ext4/namei.c
View File

@@ -1618,7 +1618,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
if (nokey) if (nokey)
return ERR_PTR(-ENOKEY); return ERR_PTR(-ENOKEY);
ext4_warning(inode->i_sb, ext4_warning(inode->i_sb,
"Inconsistent encryption contexts: %lu/%lu\n", "Inconsistent encryption contexts: %lu/%lu",
(unsigned long) dir->i_ino, (unsigned long) dir->i_ino,
(unsigned long) inode->i_ino); (unsigned long) inode->i_ino);
return ERR_PTR(-EPERM); return ERR_PTR(-EPERM);

2
fs/ext4/resize.c
View File

@@ -41,7 +41,7 @@ int ext4_resize_begin(struct super_block *sb)
*/ */
if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) { if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
ext4_warning(sb, "There are errors in the filesystem, " ext4_warning(sb, "There are errors in the filesystem, "
"so online resizing is not allowed\n"); "so online resizing is not allowed");
return -EPERM; return -EPERM;
} }