diff options
| author |   Miao Xie <miaox@cn.fujitsu.com> | 2013-05-28 10:05:39 +0000 |
|---|---|---|
| committer |   Josef Bacik <jbacik@fusionio.com> | 2013-06-14 11:30:05 -0400 |
| commit | c6adc9cc082e3cffda153999c9b9f8a8baaaaf45 (patch) | |
| tree | 45502fe9f6d6468f17dbbe7b7aa83d261626d65c /fs/btrfs/transaction.c | |
| parent | Btrfs: allow file data clone within a file (diff) | |
| download | linux-dev-c6adc9cc082e3cffda153999c9b9f8a8baaaaf45.tar.xz linux-dev-c6adc9cc082e3cffda153999c9b9f8a8baaaaf45.zip | |
Btrfs: merge pending IO for tree log write back
Before applying this patch, we flushed the log tree of the fs/file
tree firstly, and then flushed the log root tree. It is ineffective,
especially on the hard disk. This patch improved this problem by wrapping
the above two flushes by the same blk_plug.
By test, the performance of the sync write went up ~60%(2.9MB/s -> 4.6MB/s)
on my scsi disk whose disk buffer was enabled.
Test step:
# mkfs.btrfs -f -m single <disk>
# mount <disk> <mnt>
# dd if=/dev/zero of=<mnt>/file0 bs=32K count=1024 oflag=sync
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index eec8686416ca..8c8b80085e75 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -778,9 +778,7 @@ int btrfs_write_marked_extents(struct btrfs_root *root, struct extent_state *cached_state = NULL; u64 start = 0; u64 end; - struct blk_plug plug; - blk_start_plug(&plug); while (!find_first_extent_bit(dirty_pages, start, &start, &end, mark, &cached_state)) { convert_extent_bit(dirty_pages, start, end, EXTENT_NEED_WAIT, @@ -794,7 +792,6 @@ int btrfs_write_marked_extents(struct btrfs_root *root, } if (err) werr = err; - blk_finish_plug(&plug); return werr; } @@ -839,8 +836,11 @@ int btrfs_write_and_wait_marked_extents(struct btrfs_root *root, { int ret; int ret2; + struct blk_plug plug; + blk_start_plug(&plug); ret = btrfs_write_marked_extents(root, dirty_pages, mark); + blk_finish_plug(&plug); ret2 = btrfs_wait_marked_extents(root, dirty_pages, mark); if (ret) |