Commit 4989d4a0 authored by Shin'ichiro Kawasaki's avatar Shin'ichiro Kawasaki Committed by David Sterba
Browse files

btrfs: fix missing blkdev_put() call in btrfs_scan_one_device() 



The function btrfs_scan_one_device() calls blkdev_get_by_path() and
blkdev_put() to get and release its target block device. However, when
btrfs_sb_log_location_bdev() fails, blkdev_put() is not called and the
block device is left without clean up. This triggered failure of fstests
generic/085. Fix the failure path of btrfs_sb_log_location_bdev() to
call blkdev_put().

Fixes: 12659251 ("btrfs: implement log-structured superblock for ZONED mode")
CC: stable@vger.kernel.org # 5.15+
Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 212a58fd

fs/btrfs/volumes.c

+4 −2
Original line number Diff line number Diff line
@@ -1370,8 +1370,10 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags, 


	bytenr_orig = btrfs_sb_offset(0);

	ret = btrfs_sb_log_location_bdev(bdev, 0, READ, &bytenr);

	if (ret)

		return ERR_PTR(ret);

	if (ret) {

		device = ERR_PTR(ret);

		goto error_bdev_put;

	}



	disk_super = btrfs_read_disk_super(bdev, bytenr, bytenr_orig);

	if (IS_ERR(disk_super)) {