X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mkfs%2Frootdir.c;h=a1d223a2408afdcb32affdba3cb5e4e3d8a62fda;hb=51667947e435444d9e125189b2a07e3966ac145c;hp=e06b65ac13e463e5be39771c250bbc4a872aefdb;hpb=e02049d964e77d22348bf940a7027a1aff558f18;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index e06b65a..a1d223a 100644
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -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) {