Commit 6fab154a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.13-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fix from David Sterba:
 "One more fix, for a space accounting bug in zoned mode. It happens
  when a block group is switched back rw->ro and unusable bytes (due to
  zoned constraints) are subtracted twice.

  It has user visible effects so I consider it important enough for late
  -rc inclusion and backport to stable"

* tag 'for-5.13-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: zoned: fix negative space_info->bytes_readonly
parents 728a748b f9f28e5b

fs/btrfs/block-group.c

+4 −4
Original line number Diff line number Diff line
@@ -2442,16 +2442,16 @@ void btrfs_dec_block_group_ro(struct btrfs_block_group *cache) 
	spin_lock(&sinfo->lock);

	spin_lock(&cache->lock);

	if (!--cache->ro) {

		num_bytes = cache->length - cache->reserved -

			    cache->pinned - cache->bytes_super -

			    cache->zone_unusable - cache->used;

		sinfo->bytes_readonly -= num_bytes;

		if (btrfs_is_zoned(cache->fs_info)) {

			/* Migrate zone_unusable bytes back */

			cache->zone_unusable = cache->alloc_offset - cache->used;

			sinfo->bytes_zone_unusable += cache->zone_unusable;

			sinfo->bytes_readonly -= cache->zone_unusable;

		}

		num_bytes = cache->length - cache->reserved -

			    cache->pinned - cache->bytes_super -

			    cache->zone_unusable - cache->used;

		sinfo->bytes_readonly -= num_bytes;

		list_del_init(&cache->ro_list);

	}

	spin_unlock(&cache->lock);