]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
ext4: remove trailing \n from ext4_warning/ext4_error calls
authorJakub Wilk <jwilk@jwilk.net>
Wed, 27 Apr 2016 05:11:21 +0000 (01:11 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 27 Apr 2016 05:11:21 +0000 (01:11 -0400)
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>
fs/ext4/extents.c
fs/ext4/extents_status.c
fs/ext4/file.c
fs/ext4/inline.c
fs/ext4/mballoc.c
fs/ext4/mmp.c
fs/ext4/namei.c
fs/ext4/resize.c

index ba2be53a61d242765ae4c9535281007eeb00fe86..c53d5a8d2a79100c17bd70ebb677be94d1869efb 100644 (file)
@@ -2588,7 +2588,7 @@ static int ext4_remove_blocks(handle_t *handle, struct inode *inode,
                }
        } else
                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);
        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) {
 #ifdef EXT4_DEBUG
                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,
                             (unsigned long long)map->m_lblk, map->m_len);
 #endif
index e38b987ac7f5f709abb8ea1c8fb9f83ca32ce723..37e059202cd2fa333dff053b327d8faf85f9d4ac 100644 (file)
@@ -707,7 +707,7 @@ int ext4_es_insert_extent(struct inode *inode, ext4_lblk_t lblk,
            (status & EXTENT_STATUS_WRITTEN)) {
                ext4_warning(inode->i_sb, "Inserting extent [%u/%u] as "
                                " delayed and written which can potentially "
-                               " cause data loss.\n", lblk, len);
+                               " cause data loss.", lblk, len);
                WARN_ON(1);
        }
 
index fa2208bae2e1211d8d761dd4e90e934a64575306..3e850b988923f6b7e3f3c52b0b4f6aa7847343a8 100644 (file)
@@ -378,7 +378,7 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
        if (ext4_encrypted_inode(d_inode(dir)) &&
            !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
                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) inode->i_ino);
                dput(dir);
index 7bc6c855cc18ca992ac3830d3b3010e63597bc5d..ff7538c26992ea34f429de3d4d38a9a7f8f61262 100644 (file)
@@ -1780,7 +1780,7 @@ int empty_inline_dir(struct inode *dir, int *has_inline_data)
                        ext4_warning(dir->i_sb,
                                     "bad inline directory (dir #%lu) - "
                                     "inode %u, rec_len %u, name_len %d"
-                                    "inline size %d\n",
+                                    "inline size %d",
                                     dir->i_ino, le32_to_cpu(de->inode),
                                     le16_to_cpu(de->rec_len), de->name_len,
                                     inline_size);
index eeeade76012ecf66f59340332d6838451b4e6eda..efa111a7606dd13d62215694d5a2278a1cfd50c0 100644 (file)
@@ -4935,7 +4935,7 @@ int ext4_group_add_blocks(handle_t *handle, struct super_block *sb,
         * boundary.
         */
        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);
                err = -EINVAL;
                goto error_return;
index 24445275d330e07cb38623e0d548989a2a7621c4..23d436d6f8b8fe1c0e69cbe2a957dcd141448abb 100644 (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,
                       "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),
                       mmp->mmp_nodename, mmp->mmp_bdevname);
 }
@@ -353,7 +353,7 @@ skip:
         * wait for MMP interval and check mmp_seq.
         */
        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;
        }
 
index c07422d254b64a3126f6368419a5ac5fa0c0323b..6e6b3230ee4549354eb92f10244230d5f05e1b5d 100644 (file)
@@ -1618,7 +1618,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi
                        if (nokey)
                                return ERR_PTR(-ENOKEY);
                        ext4_warning(inode->i_sb,
-                                    "Inconsistent encryption contexts: %lu/%lu\n",
+                                    "Inconsistent encryption contexts: %lu/%lu",
                                     (unsigned long) dir->i_ino,
                                     (unsigned long) inode->i_ino);
                        return ERR_PTR(-EPERM);
index 34038e3598d59fa2b4bcaf2304d31602e803d5e0..cf681004b1965fba00be6e97ee9a4cbe57eb3654 100644 (file)
@@ -41,7 +41,7 @@ int ext4_resize_begin(struct super_block *sb)
         */
        if (EXT4_SB(sb)->s_mount_state & EXT4_ERROR_FS) {
                ext4_warning(sb, "There are errors in the filesystem, "
-                            "so online resizing is not allowed\n");
+                            "so online resizing is not allowed");
                return -EPERM;
        }