diff options
| author | Yan Zheng <zheng.yan@oracle.com> | 2009-01-21 12:54:03 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-01-21 12:54:03 -0500 |
| commit | 7237f1833601dcc435a64176c2c347ec4bd959f9 (patch) | |
| tree | 5e12b9a7655f03181605e02fd91b42e68ee92c2e /fs/btrfs/file.c | |
| parent | 7e6628544abad773222d8b177f738ac2db1859de (diff) | |
| download | linux-3.10-7237f1833601dcc435a64176c2c347ec4bd959f9.tar.gz linux-3.10-7237f1833601dcc435a64176c2c347ec4bd959f9.tar.bz2 linux-3.10-7237f1833601dcc435a64176c2c347ec4bd959f9.zip | |
Btrfs: fix tree logs parallel sync
To improve performance, btrfs_sync_log merges tree log sync
requests. But it wrongly merges sync requests for different
tree logs. If multiple tree logs are synced at the same time,
only one of them actually gets synced.
This patch has following changes to fix the bug:
Move most tree log related fields in btrfs_fs_info to
btrfs_root. This allows merging sync requests separately
for each tree log.
Don't insert root item into the log root tree immediately
after log tree is allocated. Root item for log tree is
inserted when log tree get synced for the first time. This
allows syncing the log root tree without first syncing all
log trees.
At tree-log sync, btrfs_sync_log first sync the log tree;
then updates corresponding root item in the log root tree;
sync the log root tree; then update the super block.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index fbcbf43f511..3e8023efaff 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1214,10 +1214,10 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync) } mutex_unlock(&root->fs_info->trans_mutex); - root->fs_info->tree_log_batch++; + root->log_batch++; filemap_fdatawrite(inode->i_mapping); btrfs_wait_ordered_range(inode, 0, (u64)-1); - root->fs_info->tree_log_batch++; + root->log_batch++; /* * ok we haven't committed the transaction yet, lets do a commit |