diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-09-03 11:35:49 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-09-03 11:35:49 +0200 |
| commit | 7a134af0a79796cb8436ad4539d14cf62cd3a06e (patch) | |
| tree | 295c0c0416a42c2df551a4b34ad594f1721fa3ad /fs/btrfs | |
| parent | 37d0892c5a94e208cf863e3b7bac014edee4346d (diff) | |
| parent | 8accfab465bb2d3a97983af6e034c5f845308cb9 (diff) | |
Merge branch 'for-2.6.32' into for-next
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/volumes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5dbefd11b4af..5cf405b0828d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -260,7 +260,7 @@ loop_lock: num_run++; batch_run++; - if (bio_sync(cur)) + if (bio_rw_flagged(cur, BIO_RW_SYNCIO)) num_sync_run++; if (need_resched()) { @@ -2903,7 +2903,7 @@ static noinline int schedule_bio(struct btrfs_root *root, bio->bi_rw |= rw; spin_lock(&device->io_lock); - if (bio_sync(bio)) + if (bio_rw_flagged(bio, BIO_RW_SYNCIO)) pending_bios = &device->pending_sync_bios; else pending_bios = &device->pending_bios; |