Pull device mapper fixes from Mike Snitzer: - Fix memory leak when freeing dm zoned target device - Update dm-devel mailing list address in MAINTAINERS * tag 'for-6.6/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm: MAINTAINERS: update the dm-devel mailing list dm zoned: free dmz->ddev array in dmz_put_zoned_devices
Unified · Split
| @@ -5984,8 +5984,8 @@ F: include/linux/devm-helpers.h · 5983 unmodified lines | ||
| 5984 | 5984 | DEVICE-MAPPER (LVM) |
| 5985 | 5985 | M: Alasdair Kergon <agk@redhat.com> |
| 5986 | 5986 | M: Mike Snitzer <snitzer@kernel.org> |
| 5987 | −M: dm-devel@redhat.com | |
| 5988 | −L: dm-devel@redhat.com | |
| 5987 | +M: dm-devel@lists.linux.dev | |
| 5988 | +L: dm-devel@lists.linux.dev | |
| 5989 | 5989 | S: Maintained |
| 5990 | 5990 | W: http://sources.redhat.com/dm |
| 5991 | 5991 | Q: http://patchwork.kernel.org/project/dm-devel/list/ |
| @@ -748,17 +748,16 @@ err: · 747 unmodified lines | ||
| 748 | 748 | /* |
| 749 | 749 | * Cleanup zoned device information. |
| 750 | 750 | */ |
| 751 | −static void dmz_put_zoned_device(struct dm_target *ti) | |
| 751 | +static void dmz_put_zoned_devices(struct dm_target *ti) | |
| 752 | 752 | { |
| 753 | 753 | struct dmz_target *dmz = ti->private; |
| 754 | 754 | int i; |
| 755 | 755 | |
| 756 | − for (i = 0; i < dmz->nr_ddevs; i++) { | |
| 757 | − if (dmz->ddev[i]) { | |
| 756 | + for (i = 0; i < dmz->nr_ddevs; i++) | |
| 757 | + if (dmz->ddev[i]) | |
| 758 | 758 | dm_put_device(ti, dmz->ddev[i]); |
| 759 | − dmz->ddev[i] = NULL; | |
| 760 | − } | |
| 761 | − } | |
| 759 | + | |
| 760 | + kfree(dmz->ddev); | |
| 762 | 761 | } |
| 763 | 762 | |
| 764 | 763 | static int dmz_fixup_devices(struct dm_target *ti) |
| @@ -948,7 +947,7 @@ err_bio: · 183 unmodified lines | ||
| 948 | 947 | err_meta: |
| 949 | 948 | dmz_dtr_metadata(dmz->metadata); |
| 950 | 949 | err_dev: |
| 951 | − dmz_put_zoned_device(ti); | |
| 950 | + dmz_put_zoned_devices(ti); | |
| 952 | 951 | err: |
| 953 | 952 | kfree(dmz->dev); |
| 954 | 953 | kfree(dmz); |
| @@ -978,7 +977,7 @@ static void dmz_dtr(struct dm_target *ti) · 23 unmodified lines | ||
| 978 | 977 | |
| 979 | 978 | bioset_exit(&dmz->bio_set); |
| 980 | 979 | |
| 981 | − dmz_put_zoned_device(ti); | |
| 980 | + dmz_put_zoned_devices(ti); | |
| 982 | 981 | |
| 983 | 982 | mutex_destroy(&dmz->chunk_lock); |
| 984 | 983 | |