genetlink: pass only network namespace to genl_has_listeners()

[cascardo/linux.git] / fs / ext4 / inline.c

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 3ea6269..4b143fe 100644 (file)
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -811,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);
@@ -870,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,
@@ -882,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) {
@@ -1807,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;
 
@@ -1820,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)
@@ -1828,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);