Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBI: use own macros for the layout volume
  UBI: fix nameless volumes handling
  UBIFS: fix non-debug configuration build

2 files changed, 5 insertions, 2 deletions

diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 3320a50ba4f0..ad76592fb2f4 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -632,6 +632,9 @@ static int verify_mkvol_req(const struct ubi_device *ubi,
         if (req->alignment != 1 && n)
                 goto bad;
 
+        if (!req->name[0] || !req->name_len)
+                goto bad;
+
         if (req->name_len > UBI_VOL_NAME_MAX) {
                 err = -ENAMETOOLONG;
                 goto bad;
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 890754c9f327..17cec0c01544 100644
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -322,7 +322,7 @@ retry:
                 goto out_free;
         }
 
-        vid_hdr->vol_type = UBI_VID_DYNAMIC;
+        vid_hdr->vol_type = UBI_LAYOUT_VOLUME_TYPE;
         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 =
@@ -632,7 +632,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
                 return -ENOMEM;
 
         vol->reserved_pebs = UBI_LAYOUT_VOLUME_EBS;
-        vol->alignment = 1;
+        vol->alignment = UBI_LAYOUT_VOLUME_ALIGN;
         vol->vol_type = UBI_DYNAMIC_VOLUME;
         vol->name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;
         memcpy(vol->name, UBI_LAYOUT_VOLUME_NAME, vol->name_len + 1);