The patch titled
mtd: give mtdconcat devices their own backing_dev_info
has been removed from the -mm tree. Its filename was
mtd-give-mtdconcat-devices-their-own-backing_dev_info.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: mtd: give mtdconcat devices their own backing_dev_info
From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
These are actual devices, give them their own BDI.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Robert Kaiser <rkaiser@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mtd/mtdconcat.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff -puN drivers/mtd/mtdconcat.c~mtd-give-mtdconcat-devices-their-own-backing_dev_info drivers/mtd/mtdconcat.c
--- a/drivers/mtd/mtdconcat.c~mtd-give-mtdconcat-devices-their-own-backing_dev_info
+++ a/drivers/mtd/mtdconcat.c
@@ -32,6 +32,7 @@ struct mtd_concat {
struct mtd_info mtd;
int num_subdev;
struct mtd_info **subdev;
+ struct backing_dev_info backing_dev_info;
};
/*
@@ -782,10 +783,9 @@ struct mtd_info *mtd_concat_create(struc
for (i = 1; i < num_devs; i++) {
if (concat->mtd.type != subdev[i]->type) {
- kfree(concat);
printk("Incompatible device type on \"%s\"\n",
subdev[i]->name);
- return NULL;
+ goto error;
}
if (concat->mtd.flags != subdev[i]->flags) {
/*
@@ -794,10 +794,9 @@ struct mtd_info *mtd_concat_create(struc
*/
if ((concat->mtd.flags ^ subdev[i]->
flags) & ~MTD_WRITEABLE) {
- kfree(concat);
printk("Incompatible device flags on \"%s\"\n",
subdev[i]->name);
- return NULL;
+ goto error;
} else
/* if writeable attribute differs,
make super device writeable */
@@ -809,9 +808,12 @@ struct mtd_info *mtd_concat_create(struc
* - copy-mapping is still permitted
*/
if (concat->mtd.backing_dev_info !=
- subdev[i]->backing_dev_info)
+ subdev[i]->backing_dev_info) {
+ concat->backing_dev_info = default_backing_dev_info;
+ bdi_init(&concat->backing_dev_info);
concat->mtd.backing_dev_info =
- &default_backing_dev_info;
+ &concat->backing_dev_info;
+ }
concat->mtd.size += subdev[i]->size;
concat->mtd.ecc_stats.badblocks +=
@@ -821,10 +823,9 @@ struct mtd_info *mtd_concat_create(struc
concat->mtd.oobsize != subdev[i]->oobsize ||
!concat->mtd.read_oob != !subdev[i]->read_oob ||
!concat->mtd.write_oob != !subdev[i]->write_oob) {
- kfree(concat);
printk("Incompatible OOB or ECC data on \"%s\"\n",
subdev[i]->name);
- return NULL;
+ goto error;
}
concat->subdev[i] = subdev[i];
@@ -903,11 +904,10 @@ struct mtd_info *mtd_concat_create(struc
kmalloc(num_erase_region *
sizeof (struct mtd_erase_region_info), GFP_KERNEL);
if (!erase_region_p) {
- kfree(concat);
printk
("memory allocation error while creating erase region list"
" for device \"%s\"\n", name);
- return NULL;
+ goto error;
}
/*
@@ -968,6 +968,12 @@ struct mtd_info *mtd_concat_create(struc
}
return &concat->mtd;
+
+error:
+ if (concat->mtd.backing_dev_info == &concat->backing_dev_info)
+ bdi_destroy(&concat->backing_dev_info);
+ kfree(concat);
+ return NULL;
}
/*
@@ -977,6 +983,8 @@ struct mtd_info *mtd_concat_create(struc
void mtd_concat_destroy(struct mtd_info *mtd)
{
struct mtd_concat *concat = CONCAT(mtd);
+ if (concat->mtd.backing_dev_info == &concat->backing_dev_info)
+ bdi_destroy(&concat->backing_dev_info);
if (concat->mtd.numeraseregions)
kfree(concat->mtd.eraseregions);
kfree(concat);
_
Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are
radix-tree-use-indirect-bit.patch
mtd-give-mtdconcat-devices-their-own-backing_dev_info.patch
mm-scalable-bdi-statistics-counters.patch
mm-count-reclaimable-pages-per-bdi.patch
mm-count-writeback-pages-per-bdi.patch
mm-expose-bdi-statistics-in-sysfs.patch
lib-floating-proportions.patch
lib-floating-proportions-_single.patch
lib-floating-proportions-_single-tidy.patch
mm-per-device-dirty-threshold.patch
mm-dirty-balancing-for-tasks.patch
debug-sysfs-files-for-the-current-ratio-size-total.patch
intel-iommu-dmar-detection-and-parsing-logic.patch
intel-iommu-pci-generic-helper-function.patch
intel-iommu-clflush_cache_range-now-takes-size-param.patch
intel-iommu-iova-allocation-and-management-routines.patch
intel-iommu-intel-iommu-driver.patch
intel-iommu-avoid-memory-allocation-failures-in-dma-map-api-calls.patch
intel-iommu-intel-iommu-cmdline-option-forcedac.patch
intel-iommu-dmar-fault-handling-support.patch
intel-iommu-iommu-gfx-workaround.patch
intel-iommu-iommu-floppy-workaround.patch
task-containersv11-add-procfs-interface-containers-bdi-init-hooks.patch
workqueue-debug-flushing-deadlocks-with-lockdep.patch
workqueue-debug-work-related-deadlocks-with-lockdep.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
