Skip to content

Commit 6c55732

Browse files
fdmananagregkh
authored andcommitted
btrfs: fix lost error when running device stats on multiple devices fs
[ Upstream commit 1c37d89 ] Whenever we get an error updating the device stats item for a device in btrfs_run_dev_stats() we allow the loop to go to the next device, and if updating the stats item for the next device succeeds, we end up losing the error we had from the previous device. Fix this by breaking out of the loop once we get an error and make sure it's returned to the caller. Since we are in the transaction commit path (and in the critical section actually), returning the error will result in a transaction abort. Fixes: 733f4fb ("Btrfs: read device stats on mount, write modified ones during commit") Signed-off-by: Filipe Manana <fdmanana@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 3c645c6 commit 6c55732

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

fs/btrfs/volumes.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7874,8 +7874,9 @@ int btrfs_run_dev_stats(struct btrfs_trans_handle *trans)
78747874
smp_rmb();
78757875

78767876
ret = update_dev_stat_item(trans, device);
7877-
if (!ret)
7878-
atomic_sub(stats_cnt, &device->dev_stats_ccnt);
7877+
if (ret)
7878+
break;
7879+
atomic_sub(stats_cnt, &device->dev_stats_ccnt);
78797880
}
78807881
mutex_unlock(&fs_devices->device_list_mutex);
78817882

0 commit comments

Comments
 (0)