lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Run igrab on data=ordered inodes to prevent deadlocks during writeout

Browse Source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2008-01-16 11:44:43 -05:00
parent 9cce6c3bfc
commit 2da98f003f
5 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fs/btrfs/inode.c
View File

@@ -601,6 +601,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry)
{
struct btrfs_root *root;
struct btrfs_trans_handle *trans;
struct inode *inode = dentry->d_inode;
int ret;
unsigned long nr = 0;
@@ -617,6 +618,18 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry)
ret = btrfs_unlink_trans(trans, root, dir, dentry);
nr = trans->blocks_used;
if (inode->i_nlink == 0) {
int found;
/* if the inode isn't linked anywhere,
* we don't need to worry about
* data=ordered
*/
found = btrfs_del_ordered_inode(inode);
if (found == 1) {
atomic_dec(&inode->i_count);
}
}
btrfs_end_transaction(trans, root);
fail:
mutex_unlock(&root->fs_info->fs_mutex);
@@ -993,15 +1006,22 @@ fail:
return err;
}
void btrfs_drop_inode(struct inode *inode)
void btrfs_put_inode(struct inode *inode)
{
if (!BTRFS_I(inode)->ordered_trans || inode->i_nlink) {
generic_drop_inode(inode);
int ret;
if (!BTRFS_I(inode)->ordered_trans) {
return;
}
/* FIXME, make sure this delete actually ends up in the transaction */
btrfs_del_ordered_inode(inode);
generic_drop_inode(inode);
if (mapping_tagged(inode->i_mapping, PAGECACHE_TAG_DIRTY) ||
mapping_tagged(inode->i_mapping, PAGECACHE_TAG_WRITEBACK))
return;
ret = btrfs_del_ordered_inode(inode);
if (ret == 1) {
atomic_dec(&inode->i_count);
}
}
void btrfs_delete_inode(struct inode *inode)