Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94191985 authored by Tao Ma's avatar Tao Ma Committed by Theodore Ts'o
Browse files

ext4: let fiemap work with inline data 



fiemap is used to find the disk layout of a file, as for inline data,
let us just pretend like a file with just one extent.

Signed-off-by: default avatarTao Ma <boyu.mt@taobao.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 32f7f22c

fs/ext4/extents.c

+9 −0
Original line number Diff line number Diff line
@@ -4802,6 +4802,15 @@ int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, 
	ext4_lblk_t start_blk;

	int error = 0;



	if (ext4_has_inline_data(inode)) {

		int has_inline = 1;



		error = ext4_inline_data_fiemap(inode, fieinfo, &has_inline);



		if (has_inline)

			return error;

	}



	/* fallback to generic here if not in extents fmt */

	if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)))

		return generic_block_fiemap(inode, fieinfo, start, len,

fs/ext4/inline.c

+35 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "ext4.h"

#include "xattr.h"

#include "truncate.h"

#include <linux/fiemap.h>



#define EXT4_XATTR_SYSTEM_DATA	"data"

#define EXT4_MIN_INLINE_DATA_SIZE	((sizeof(__le32) * EXT4_N_BLOCKS))
@@ -1680,3 +1681,37 @@ int ext4_destroy_inline_data(handle_t *handle, struct inode *inode) 


	return ret;

}



int ext4_inline_data_fiemap(struct inode *inode,

			    struct fiemap_extent_info *fieinfo,

			    int *has_inline)

{

	__u64 physical = 0;

	__u64 length;

	__u32 flags = FIEMAP_EXTENT_DATA_INLINE | FIEMAP_EXTENT_LAST;

	int error = 0;

	struct ext4_iloc iloc;



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

	if (!ext4_has_inline_data(inode)) {

		*has_inline = 0;

		goto out;

	}



	error = ext4_get_inode_loc(inode, &iloc);

	if (error)

		goto out;



	physical = 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);

	brelse(iloc.bh);

out:

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

	return (error < 0 ? error : 0);

}

fs/ext4/xattr.h

+10 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ extern int empty_inline_dir(struct inode *dir, int *has_inline_data); 
extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode,

					struct ext4_dir_entry_2 **parent_de,

					int *retval);

extern int ext4_inline_data_fiemap(struct inode *inode,

				   struct fiemap_extent_info *fieinfo,

				   int *has_inline);

# else  /* CONFIG_EXT4_FS_XATTR */



static inline int
@@ -398,6 +401,13 @@ ext4_get_first_inline_block(struct inode *inode, 
{

	return NULL;

}



static inline int ext4_inline_data_fiemap(struct inode *inode,

					  struct fiemap_extent_info *fieinfo,

					  int *has_inline)

{

	return 0;

}

# endif  /* CONFIG_EXT4_FS_XATTR */



#ifdef CONFIG_EXT4_FS_SECURITY