marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: mkfs/rootdir: Fix inline extent creation check 

Just like convert, we need extra check against sector size for creating
inline extent.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2018-03-20 14:42:25 +08:00 committed by David Sterba
parent e02049d964
commit 51667947e4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkfs/rootdir.c
View File

@ -139,7 +139,8 @@ static int fill_inode_item(struct btrfs_trans_handle *trans,
}
if (S_ISREG(src->st_mode)) {
btrfs_set_stack_inode_size(dst, (u64)src->st_size);
if (src->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info))
if (src->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info) &&
src->st_size < sectorsize)
btrfs_set_stack_inode_nbytes(dst, src->st_size);
else {
blocks = src->st_size / sectorsize;
@ -327,7 +328,8 @@ static int add_file_items(struct btrfs_trans_handle *trans,
if (st->st_size % sectorsize)
blocks += 1;
if (st->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info)) {
if (st->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info) &&
st->st_size < sectorsize) {
char *buffer = malloc(st->st_size);
if (!buffer) {