Commit 7046ae35 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Theodore Ts'o
Browse files

ext4: Add iomap support for inline data 



Report inline data as a IOMAP_F_DATA_INLINE mapping.  This allows to use
iomap_seek_hole and iomap_seek_data in ext4_llseek and makes switching
to iomap_fiemap in ext4_fiemap easier.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 9ca250a5

fs/ext4/ext4.h

+4 −0
Original line number Diff line number Diff line
@@ -3048,6 +3048,10 @@ extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode, 
extern int ext4_inline_data_fiemap(struct inode *inode,

				   struct fiemap_extent_info *fieinfo,

				   int *has_inline, __u64 start, __u64 len);



struct iomap;

extern int ext4_inline_data_iomap(struct inode *inode, struct iomap *iomap);



extern int ext4_try_to_evict_inline_data(handle_t *handle,

					 struct inode *inode,

					 int needed);

fs/ext4/inline.c

+33 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/iomap.h>

#include <linux/fiemap.h>



#include "ext4_jbd2.h"
@@ -1827,6 +1828,38 @@ int ext4_destroy_inline_data(handle_t *handle, struct inode *inode) 
	return ret;

}



int ext4_inline_data_iomap(struct inode *inode, struct iomap *iomap)

{

	__u64 addr;

	int error = -EAGAIN;

	struct ext4_iloc iloc;



	down_read(&EXT4_I(inode)->xattr_sem);

	if (!ext4_has_inline_data(inode))

		goto out;



	error = ext4_get_inode_loc(inode, &iloc);

	if (error)

		goto out;



	addr = (__u64)iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits;

	addr += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data;

	addr += offsetof(struct ext4_inode, i_block);



	brelse(iloc.bh);



	iomap->addr = addr;

	iomap->offset = 0;

	iomap->length = min_t(loff_t, ext4_get_inline_size(inode),

			      i_size_read(inode));

	iomap->type = 0;

	iomap->flags = IOMAP_F_DATA_INLINE;



out:

	up_read(&EXT4_I(inode)->xattr_sem);

	return error;

}



int ext4_inline_data_fiemap(struct inode *inode,

			    struct fiemap_extent_info *fieinfo,

			    int *has_inline, __u64 start, __u64 len)

fs/ext4/inode.c

+14 −2
Original line number Diff line number Diff line
@@ -3404,8 +3404,20 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
	struct ext4_map_blocks map;

	int ret;





	if (flags & IOMAP_REPORT) {

		if (ext4_has_inline_data(inode)) {

			ret = ext4_inline_data_iomap(inode, iomap);

			if (ret != -EAGAIN) {

				if (ret == 0 && offset >= iomap->length)

					ret = -ENOENT;

				return ret;

			}

		}

	} else {

		if (WARN_ON_ONCE(ext4_has_inline_data(inode)))

			return -ERANGE;

	}



	map.m_lblk = first_block;

	map.m_len = last_block - first_block + 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE