ext4: remove trailing \n from ext4_warning/ext4_error calls

[mirror_ubuntu-zesty-kernel.git] / fs / ext4 / namei.c

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 48e4b8907826eca52a1e94e14bdfdb0fd2240c56..6e6b3230ee4549354eb92f10244230d5f05e1b5d 100644 (file)
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1107,6 +1107,11 @@ int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
        }
 
        while (1) {
+               if (fatal_signal_pending(current)) {
+                       err = -ERESTARTSYS;
+                       goto errout;
+               }
+               cond_resched();
                block = dx_get_block(frame->at);
                ret = htree_dirblock_to_tree(dir_file, dir, block, &hinfo,
                                             start_hash, start_minor_hash);
@@ -1613,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);