diff options
| author | Yan Zheng <zheng.yan@oracle.com> | 2009-01-05 15:43:42 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-01-05 15:43:42 -0500 |
| commit | ec051c0f929afe5c42c24bb07abf577c616c208c (patch) | |
| tree | a9b75cd422cf7dde92c9dbb8828feb062e2c35ec | |
| parent | 2d69a0f88459fae35df3ddef4934a2dad67e2765 (diff) | |
| download | linux-ec051c0f929afe5c42c24bb07abf577c616c208c.tar.gz | |
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: Yan Zheng <zheng.yan@oracle.com>
| -rw-r--r-- | fs/btrfs/tree-log.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 33eee256ee81..b1c2921f5bef 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -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); |