1 files changed, 27 insertions, 18 deletions

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 25b3bd61c7ec..56fc3fbce838 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -86,8 +86,10 @@ int ubi_change_vtbl_record(struct ubi_device *ubi, int idx,
 {
         int i, err;
         uint32_t crc;
+        struct ubi_volume *layout_vol;
 
         ubi_assert(idx >= 0 && idx < ubi->vtbl_slots);
+        layout_vol = ubi->volumes[vol_id2idx(ubi, UBI_LAYOUT_VOLUME_ID)];
 
         if (!vtbl_rec)
                 vtbl_rec = &empty_vtbl_record;
@@ -96,31 +98,25 @@ int ubi_change_vtbl_record(struct ubi_device *ubi, int idx,
                 vtbl_rec->crc = cpu_to_be32(crc);
         }
 
-        mutex_lock(&ubi->vtbl_mutex);
         memcpy(&ubi->vtbl[idx], vtbl_rec, sizeof(struct ubi_vtbl_record));
         for (i = 0; i < UBI_LAYOUT_VOLUME_EBS; i++) {
-                err = ubi_eba_unmap_leb(ubi, UBI_LAYOUT_VOL_ID, i);
-                if (err) {
-                        mutex_unlock(&ubi->vtbl_mutex);
+                err = ubi_eba_unmap_leb(ubi, layout_vol, i);
+                if (err)
                         return err;
-                }
-                err = ubi_eba_write_leb(ubi, UBI_LAYOUT_VOL_ID, i, ubi->vtbl, 0,
+
+                err = ubi_eba_write_leb(ubi, layout_vol, i, ubi->vtbl, 0,
                                         ubi->vtbl_size, UBI_LONGTERM);
-                if (err) {
-                        mutex_unlock(&ubi->vtbl_mutex);
+                if (err)
                         return err;
-                }
         }
 
         paranoid_vtbl_check(ubi);
-        mutex_unlock(&ubi->vtbl_mutex);
-        return ubi_wl_flush(ubi);
+        return 0;
 }
 
 /**
- * vol_til_check - check if volume table is not corrupted and contains sensible
- * data.
- *
+ * vtbl_check - check if volume table is not corrupted and contains sensible
+ *              data.
  * @ubi: UBI device description object
  * @vtbl: volume table
  *
@@ -273,7 +269,7 @@ static int create_vtbl(struct ubi_device *ubi, struct ubi_scan_info *si,
          * this volume table copy was found during scanning. It has to be wiped
          * out.
          */
-        sv = ubi_scan_find_sv(si, UBI_LAYOUT_VOL_ID);
+        sv = ubi_scan_find_sv(si, UBI_LAYOUT_VOLUME_ID);
         if (sv)
                 old_seb = ubi_scan_find_seb(sv, copy);
 
@@ -285,7 +281,7 @@ retry:
         }
 
         vid_hdr->vol_type = UBI_VID_DYNAMIC;
-        vid_hdr->vol_id = cpu_to_be32(UBI_LAYOUT_VOL_ID);
+        vid_hdr->vol_id = cpu_to_be32(UBI_LAYOUT_VOLUME_ID);
         vid_hdr->compat = UBI_LAYOUT_VOLUME_COMPAT;
         vid_hdr->data_size = vid_hdr->used_ebs =
                              vid_hdr->data_pad = cpu_to_be32(0);
@@ -518,6 +514,17 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                 vol->name[vol->name_len] = '\0';
                 vol->vol_id = i;
 
+                if (vtbl[i].flags & UBI_VTBL_AUTORESIZE_FLG) {
+                        /* Auto re-size flag may be set only for one volume */
+                        if (ubi->autoresize_vol_id != -1) {
+                                ubi_err("more then one auto-resize volume (%d "
+                                        "and %d)", ubi->autoresize_vol_id, i);
+                                return -EINVAL;
+                        }
+
+                        ubi->autoresize_vol_id = i;
+                }
+
                 ubi_assert(!ubi->volumes[i]);
                 ubi->volumes[i] = vol;
                 ubi->vol_count += 1;
@@ -568,6 +575,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                 vol->last_eb_bytes = sv->last_data_size;
         }
 
+        /* And add the layout volume */
         vol = kzalloc(sizeof(struct ubi_volume), GFP_KERNEL);
         if (!vol)
                 return -ENOMEM;
@@ -582,7 +590,8 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
         vol->last_eb_bytes = vol->reserved_pebs;
         vol->used_bytes =
                 (long long)vol->used_ebs * (ubi->leb_size - vol->data_pad);
-        vol->vol_id = UBI_LAYOUT_VOL_ID;
+        vol->vol_id = UBI_LAYOUT_VOLUME_ID;
+        vol->ref_count = 1;
 
         ubi_assert(!ubi->volumes[i]);
         ubi->volumes[vol_id2idx(ubi, vol->vol_id)] = vol;
@@ -734,7 +743,7 @@ int ubi_read_volume_table(struct ubi_device *ubi, struct ubi_scan_info *si)
         ubi->vtbl_size = ubi->vtbl_slots * UBI_VTBL_RECORD_SIZE;
         ubi->vtbl_size = ALIGN(ubi->vtbl_size, ubi->min_io_size);
 
-        sv = ubi_scan_find_sv(si, UBI_LAYOUT_VOL_ID);
+        sv = ubi_scan_find_sv(si, UBI_LAYOUT_VOLUME_ID);
         if (!sv) {
                 /*
                  * No logical eraseblocks belonging to the layout volume were