aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-06-25 16:01:31 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:03 -0400
commit89ce8a63d0c761fbb02089850605360f389477d8 (patch)
treea509b1daf6e41f7768eaf49235c573690f12ef9b /fs/btrfs/file.c
parent333db94cdde9e6dfdedab9290d04d812f83e0922 (diff)
Add btrfs_end_transaction_throttle to force writers to wait for pending commits
The existing throttle mechanism was often not sufficient to prevent new writers from coming in and making a given transaction run forever. This adds an explicit wait at the end of most operations so they will allow the current transaction to close. There is no wait inside file_write, inode updates, or cow filling, all which have different deadlock possibilities. This is a temporary measure until better asynchronous commit support is added. This code leads to stalls as it waits for data=ordered writeback, and it really needs to be fixed. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index b7f8f92daf8a..ece221cba90c 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -934,7 +934,6 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
934 balance_dirty_pages_ratelimited_nr(inode->i_mapping, num_pages); 934 balance_dirty_pages_ratelimited_nr(inode->i_mapping, num_pages);
935 if (num_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1) 935 if (num_pages < (root->leafsize >> PAGE_CACHE_SHIFT) + 1)
936 btrfs_btree_balance_dirty(root, 1); 936 btrfs_btree_balance_dirty(root, 1);
937 btrfs_throttle(root);
938 cond_resched(); 937 cond_resched();
939 } 938 }
940out: 939out: