Merge branch 'next' into for-linus

Prepare first round of input updates for 3.20.

1 files changed, 27 insertions, 15 deletions

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index bea662bd0ca6..4b143febf21f 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -594,6 +594,7 @@ retry:
         if (ret) {
                 unlock_page(page);
                 page_cache_release(page);
+                page = NULL;
                 ext4_orphan_add(handle, inode);
                 up_write(&EXT4_I(inode)->xattr_sem);
                 sem_held = 0;
@@ -613,7 +614,8 @@ retry:
         if (ret == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))
                 goto retry;
 
-        block_commit_write(page, from, to);
+        if (page)
+                block_commit_write(page, from, to);
 out:
         if (page) {
                 unlock_page(page);
@@ -809,8 +811,11 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
         ret = __block_write_begin(page, 0, inline_size,
                                   ext4_da_get_block_prep);
         if (ret) {
+                up_read(&EXT4_I(inode)->xattr_sem);
+                unlock_page(page);
+                page_cache_release(page);
                 ext4_truncate_failed_write(inode);
-                goto out;
+                return ret;
         }
 
         SetPageDirty(page);
@@ -868,6 +873,12 @@ retry_journal:
                         goto out_journal;
         }
 
+        /*
+         * We cannot recurse into the filesystem as the transaction
+         * is already started.
+         */
+        flags |= AOP_FLAG_NOFS;
+
         if (ret == -ENOSPC) {
                 ret = ext4_da_convert_inline_data_to_extent(mapping,
                                                             inode,
@@ -880,11 +891,6 @@ retry_journal:
                 goto out;
         }
 
-        /*
-         * We cannot recurse into the filesystem as the transaction
-         * is already started.
-         */
-        flags |= AOP_FLAG_NOFS;
 
         page = grab_cache_page_write_begin(mapping, 0, flags);
         if (!page) {
@@ -1126,8 +1132,7 @@ static int ext4_finish_convert_inline_dir(handle_t *handle,
         memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,
                 inline_size - EXT4_INLINE_DOTDOT_SIZE);
 
-        if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
-                                       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+        if (ext4_has_metadata_csum(inode->i_sb))
                 csum_size = sizeof(struct ext4_dir_entry_tail);
 
         inode->i_size = inode->i_sb->s_blocksize;
@@ -1806,11 +1811,12 @@ int ext4_destroy_inline_data(handle_t *handle, struct inode *inode)
 
 int ext4_inline_data_fiemap(struct inode *inode,
                             struct fiemap_extent_info *fieinfo,
-                            int *has_inline)
+                            int *has_inline, __u64 start, __u64 len)
 {
         __u64 physical = 0;
-        __u64 length;
-        __u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_LAST;
+        __u64 inline_len;
+        __u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_NOT_ALIGNED |
+                FIEMAP_EXTENT_LAST;
         int error = 0;
         struct ext4_iloc iloc;
 
@@ -1819,6 +1825,13 @@ int ext4_inline_data_fiemap(struct inode *inode,
                 *has_inline = 0;
                 goto out;
         }
+        inline_len = min_t(size_t, ext4_get_inline_size(inode),
+                           i_size_read(inode));
+        if (start >= inline_len)
+                goto out;
+        if (start + len < inline_len)
+                inline_len = start + len;
+        inline_len -= start;
 
         error = ext4_get_inode_loc(inode, &iloc);
         if (error)
@@ -1827,11 +1840,10 @@ int ext4_inline_data_fiemap(struct inode *inode,
         physical = (__u64)iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits;
         physical += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data;
         physical += offsetof(struct ext4_inode, i_block);
-        length = i_size_read(inode);
 
         if (physical)
-                error = fiemap_fill_next_extent(fieinfo, 0, physical,
-                                                length, flags);
+                error = fiemap_fill_next_extent(fieinfo, start, physical,
+                                                inline_len, flags);
         brelse(iloc.bh);
 out:
         up_read(&EXT4_I(inode)->xattr_sem);