diff options
| author | Anand Jain <anand.jain@oracle.com> | 2017-06-13 17:05:40 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-06-19 18:26:04 +0200 |
| commit | cea7c8bf77209ba11350e9c6f541064c820a174c (patch) | |
| tree | 96252c92b9c382171a6425d8e8e3080b977f543e /fs | |
| parent | 12b9bf0b942ecca695fe709ea754091918d88b01 (diff) | |
| download | linux-stable-cea7c8bf77209ba11350e9c6f541064c820a174c.tar.gz linux-stable-cea7c8bf77209ba11350e9c6f541064c820a174c.tar.bz2 linux-stable-cea7c8bf77209ba11350e9c6f541064c820a174c.zip | |
btrfs: remove redundant null bdev counting during flush submission
There is no extra benefit to count null bdev during the submit loop,
as these null devices will be anyway checked during command
completion device loop just after the submit loop. We are holding the
device_list_mutex, the device->bdev status won't change in between.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 1e90469cc0d2..528eef955060 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3564,7 +3564,6 @@ static int barrier_all_devices(struct btrfs_fs_info *info) { struct list_head *head; struct btrfs_device *dev; - int errors_send = 0; int errors_wait = 0; int ret; @@ -3573,10 +3572,8 @@ static int barrier_all_devices(struct btrfs_fs_info *info) list_for_each_entry_rcu(dev, head, dev_list) { if (dev->missing) continue; - if (!dev->bdev) { - errors_send++; + if (!dev->bdev) continue; - } if (!dev->in_fs_metadata || !dev->writeable) continue; @@ -3602,7 +3599,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info) } } - if (errors_send || errors_wait) { + if (errors_wait) { /* * At some point we need the status of all disks * to arrive at the volume status. So error checking |