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

Commit ec051c0f authored by Yan Zheng's avatar Yan Zheng Committed by Chris Mason
Browse files

Btrfs: avoid orphan inode caused by log replay 



drop_one_dir_item does not properly update inode's link count. It can be
reproduced by executing following commands:

#touch test
#sync
#rm -f test
#dd if=/dev/zero bs=4k count=1 of=test conv=fsync
#echo b > /proc/sysrq-trigger

This fixes it by adding an BTRFS_ORPHAN_ITEM_KEY for the inode

Signed-off-by: default avatarYan Zheng <zheng.yan@oracle.com>
parent 2d69a0f8

fs/btrfs/tree-log.c

+6 −1
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
static int __btrfs_log_inode(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root, struct inode *inode,

			     int inode_only);

static int link_to_fixup_dir(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root,

			     struct btrfs_path *path, u64 objectid);



/*

 * tree logging is a special write ahead log used to make sure that
@@ -638,8 +641,10 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, 
	inode = read_one_inode(root, location.objectid);

	BUG_ON(!inode);



	btrfs_inc_nlink(inode);

	ret = link_to_fixup_dir(trans, root, path, location.objectid);

	BUG_ON(ret);

	ret = btrfs_unlink_inode(trans, root, dir, inode, name, name_len);

	BUG_ON(ret);

	kfree(name);



	iput(inode);