aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorJosef Bacik <josef@redhat.com>2011-03-04 14:09:46 -0500
committerJosef Bacik <josef@redhat.com>2011-03-17 14:21:28 -0400
commitded5db9de78f963979e1605f859de67626f54693 (patch)
treed52b91b659b22f5f24ba8b8bf42a3a829e335010 /fs/btrfs/inode.c
parent66b4ffd110f9b48b8d8c1319ee446b53b8d073bf (diff)
Btrfs: make sure to remove the orphan item from the in-memory list
This fixes a problem where if truncate fails the inode will still be on the in memory orphan list. This is will make us complain when the inode gets destroyed because it's still on the orphan list. So if we fail just remove us from the in memory list and carry on. Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 0600265cb9b0..3bd0ff63bf30 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6589,6 +6589,12 @@ static int btrfs_truncate(struct inode *inode)
6589 ret = btrfs_orphan_del(trans, inode); 6589 ret = btrfs_orphan_del(trans, inode);
6590 if (ret) 6590 if (ret)
6591 err = ret; 6591 err = ret;
6592 } else if (ret && inode->i_nlink > 0) {
6593 /*
6594 * Failed to do the truncate, remove us from the in memory
6595 * orphan list.
6596 */
6597 ret = btrfs_orphan_del(NULL, inode);
6592 } 6598 }
6593 6599
6594 ret = btrfs_update_inode(trans, root, inode); 6600 ret = btrfs_update_inode(trans, root, inode);