From 94b604429a6cd94ddc128fa2772c57209bb1318f Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Wed, 26 May 2010 11:02:00 -0400 Subject: Btrfs: avoid ENOSPC errors in btrfs_dirty_inode btrfs_dirty_inode tries to sneak in without much waiting or space reservation, mostly for performance reasons. This usually works well but can cause problems when there are many many writers. When btrfs_update_inode fails with ENOSPC, we fallback to a slower btrfs_start_transaction call that will reserve some space. Signed-off-by: Chris Mason --- fs/btrfs/inode.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index ca9d5501d340..5d62f21b2e45 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4308,10 +4308,18 @@ void btrfs_dirty_inode(struct inode *inode) btrfs_set_trans_block_group(trans, inode); ret = btrfs_update_inode(trans, root, inode); - if (ret) - printk(KERN_ERR"btrfs: fail to dirty inode %lu error %d\n", - inode->i_ino, ret); + if (ret && ret == -ENOSPC) { + /* whoops, lets try again with the full transaction */ + btrfs_end_transaction(trans, root); + trans = btrfs_start_transaction(root, 1); + btrfs_set_trans_block_group(trans, inode); + ret = btrfs_update_inode(trans, root, inode); + if (ret) { + printk(KERN_ERR"btrfs: fail to dirty inode %lu error %d\n", + inode->i_ino, ret); + } + } btrfs_end_transaction(trans, root); } -- cgit v1.2.3