FROMLIST: drm: Add HDMI 2.0 VIC support for AVI info-frames

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / extent_map.c

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index 2487116d0d3312981834aa3667fd708dc7aa05ab..e4719e0a3f9993b46a0158c78e38c08f3f1158fd 100644 (file)
--- a/fs/ocfs2/extent_map.c
+++ b/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;
@@ -781,7 +783,6 @@ int ocfs2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
        cpos = map_start >> osb->s_clustersize_bits;
        mapping_end = ocfs2_clusters_for_bytes(inode->i_sb,
                                               map_start + map_len);
-       mapping_end -= cpos;
        is_last = 0;
        while (cpos < mapping_end && !is_last) {
                u32 fe_flags;
@@ -852,20 +853,20 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int whence)
 
        down_read(&OCFS2_I(inode)->ip_alloc_sem);
 
-       if (*offset >= inode->i_size) {
+       if (*offset >= i_size_read(inode)) {
                ret = -ENXIO;
                goto out_unlock;
        }
 
        if (OCFS2_I(inode)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
                if (whence == SEEK_HOLE)
-                       *offset = inode->i_size;
+                       *offset = i_size_read(inode);
                goto out_unlock;
        }
 
        clen = 0;
        cpos = *offset >> cs_bits;
-       cend = ocfs2_clusters_for_bytes(inode->i_sb, inode->i_size);
+       cend = ocfs2_clusters_for_bytes(inode->i_sb, i_size_read(inode));
 
        while (cpos < cend && !is_last) {
                ret = ocfs2_get_clusters_nocache(inode, di_bh, cpos, &hole_size,
@@ -904,8 +905,8 @@ int ocfs2_seek_data_hole_offset(struct file *file, loff_t *offset, int whence)
                extlen = clen;
                extlen <<=  cs_bits;
 
-               if ((extoff + extlen) > inode->i_size)
-                       extlen = inode->i_size - extoff;
+               if ((extoff + extlen) > i_size_read(inode))
+                       extlen = i_size_read(inode) - extoff;
                extoff += extlen;
                if (extoff > *offset)
                        *offset = extoff;