فهرست منبع

UBI: bugfix: do not forget to increment vol_count

When creating a new volume, do not forget to increment the
vol_count variable.

Also, users are not interested in internal volumes, so do not show
them in the volumes_count sysfs file.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Artem Bityutskiy 17 سال پیش
والد
کامیت
4b3cc34061
2فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 1 1
      drivers/mtd/ubi/build.c
  2. 1 0
      drivers/mtd/ubi/vmt.c

+ 1 - 1
drivers/mtd/ubi/build.c

@@ -246,7 +246,7 @@ static ssize_t dev_attribute_show(struct device *dev,
 	else if (attr == &dev_total_eraseblocks)
 		ret = sprintf(buf, "%d\n", ubi->good_peb_count);
 	else if (attr == &dev_volumes_count)
-		ret = sprintf(buf, "%d\n", ubi->vol_count);
+		ret = sprintf(buf, "%d\n", ubi->vol_count - UBI_INT_VOL_COUNT);
 	else if (attr == &dev_max_ec)
 		ret = sprintf(buf, "%d\n", ubi->max_ec);
 	else if (attr == &dev_reserved_for_bad)

+ 1 - 0
drivers/mtd/ubi/vmt.c

@@ -357,6 +357,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
 
 	spin_lock(&ubi->volumes_lock);
 	ubi->volumes[vol_id] = vol;
+	ubi->vol_count += 1;
 	spin_unlock(&ubi->volumes_lock);
 
 	paranoid_check_volumes(ubi);