These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ocfs2 / extent_map.c

diff --git a/kernel/fs/ocfs2/extent_map.c b/kernel/fs/ocfs2/extent_map.c
index 767370b..e4719e0 100644 (file)
--- a/kernel/fs/ocfs2/extent_map.c
+++ b/kernel/fs/ocfs2/extent_map.c
@@ -305,8 +305,8 @@ static int ocfs2_last_eb_is_empty(struct inode *inode,
 
        if (el->l_tree_depth) {
                ocfs2_error(inode->i_sb,
-                           "Inode %lu has non zero tree depth in "
-                           "leaf block %llu\n", inode->i_ino,
+                           "Inode %lu has non zero tree depth in leaf block %llu\n",
+                           inode->i_ino,
                            (unsigned long long)eb_bh->b_blocknr);
                ret = -EROFS;
                goto out;
@@ -441,8 +441,8 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,
 
                if (el->l_tree_depth) {
                        ocfs2_error(inode->i_sb,
-                                   "Inode %lu has non zero tree depth in "
-                                   "leaf block %llu\n", inode->i_ino,
+                                   "Inode %lu has non zero tree depth in leaf block %llu\n",
+                                   inode->i_ino,
                                    (unsigned long long)eb_bh->b_blocknr);
                        ret = -EROFS;
                        goto out;
@@ -475,8 +475,9 @@ static int ocfs2_get_clusters_nocache(struct inode *inode,
        BUG_ON(v_cluster < le32_to_cpu(rec->e_cpos));
 
        if (!rec->e_blkno) {
-               ocfs2_error(inode->i_sb, "Inode %lu has bad extent "
-                           "record (%u, %u, 0)", inode->i_ino,
+               ocfs2_error(inode->i_sb,
+                           "Inode %lu has bad extent record (%u, %u, 0)\n",
+                           inode->i_ino,
                            le32_to_cpu(rec->e_cpos),
                            ocfs2_rec_clusters(el, rec));
                ret = -EROFS;
@@ -564,8 +565,8 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
 
                if (el->l_tree_depth) {
                        ocfs2_error(inode->i_sb,
-                                   "Inode %lu has non zero tree depth in "
-                                   "xattr leaf block %llu\n", inode->i_ino,
+                                   "Inode %lu has non zero tree depth in xattr leaf block %llu\n",
+                                   inode->i_ino,
                                    (unsigned long long)eb_bh->b_blocknr);
                        ret = -EROFS;
                        goto out;
@@ -582,8 +583,9 @@ int ocfs2_xattr_get_clusters(struct inode *inode, u32 v_cluster,
                BUG_ON(v_cluster < le32_to_cpu(rec->e_cpos));
 
                if (!rec->e_blkno) {
-                       ocfs2_error(inode->i_sb, "Inode %lu has bad extent "
-                                   "record (%u, %u, 0) in xattr", inode->i_ino,
+                       ocfs2_error(inode->i_sb,
+                                   "Inode %lu has bad extent record (%u, %u, 0) in xattr\n",
+                                   inode->i_ino,
                                    le32_to_cpu(rec->e_cpos),
                                    ocfs2_rec_clusters(el, rec));
                        ret = -EROFS;