mkfs.ubifs: use libubi to format UBI volume

libubi is now used to format directly UBI volume.
Typing mkfs.ubifs /dev/ubi0_0 is now possible.
dtypes should be ok as they are taken from UBIFS code.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/Makefile b/Makefile
index 969ab876de95ae6a68d9d23ce4bc2a0710b1d2bf..577634f57b5316b19678910c7f6b15c472ab2616 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ifeq ($(WITHOUT_XATTR), 1)
   CPPFLAGS += -DWITHOUT_XATTR
 endif
 
-SUBDIRS = mkfs.ubifs ubi-utils
+SUBDIRS = ubi-utils mkfs.ubifs
 
 TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
        ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \

diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile
index e5bf9cec43fae39932c369aa48ca243909932414..a678b0a63a272cf77003d43eec2d88904bd93c45 100644 (file)
--- a/mkfs.ubifs/Makefile
+++ b/mkfs.ubifs/Makefile
@@ -1,8 +1,11 @@
+
+CPPFLAGS += -I../include -I../ubi-utils/include
+
 ALL_SOURCES=*.[ch] hashtable/*.[ch]
 
 TARGETS = mkfs.ubifs
 
-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
+LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L../ubi-utils/ -lubi
 
 include ../common.mk
 

diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c
index f6d43522eb3632b8e1d763d1ee18187dce8e1dcd..60002ff06960537e6df4b630ff7c44fc912253ce 100644 (file)
--- a/mkfs.ubifs/lpt.c
+++ b/mkfs.ubifs/lpt.c
@@ -410,7 +410,7 @@ int create_lpt(struct ubifs_info *c)
                        alen = ALIGN(len, c->min_io_size);
                        set_ltab(c, lnum, c->leb_size - alen, alen - len);
                        memset(p, 0xff, alen - len);
-                       err = write_leb(lnum++, alen, buf);
+                       err = write_leb(lnum++, alen, buf, UBI_SHORTTERM);
                        if (err)
                                goto out;
                        p = buf;
@@ -452,7 +452,7 @@ int create_lpt(struct ubifs_info *c)
                                set_ltab(c, lnum, c->leb_size - alen,
                                            alen - len);
                                memset(p, 0xff, alen - len);
-                               err = write_leb(lnum++, alen, buf);
+                               err = write_leb(lnum++, alen, buf, UBI_SHORTTERM);
                                if (err)
                                        goto out;
                                p = buf;
@@ -499,7 +499,7 @@ int create_lpt(struct ubifs_info *c)
                        alen = ALIGN(len, c->min_io_size);
                        set_ltab(c, lnum, c->leb_size - alen, alen - len);
                        memset(p, 0xff, alen - len);
-                       err = write_leb(lnum++, alen, buf);
+                       err = write_leb(lnum++, alen, buf, UBI_SHORTTERM);
                        if (err)
                                goto out;
                        p = buf;
@@ -522,7 +522,7 @@ int create_lpt(struct ubifs_info *c)
                alen = ALIGN(len, c->min_io_size);
                set_ltab(c, lnum, c->leb_size - alen, alen - len);
                memset(p, 0xff, alen - len);
-               err = write_leb(lnum++, alen, buf);
+               err = write_leb(lnum++, alen, buf, UBI_SHORTTERM);
                if (err)
                        goto out;
                p = buf;
@@ -542,7 +542,7 @@ int create_lpt(struct ubifs_info *c)
 
        /* Write remaining buffer */
        memset(p, 0xff, alen - len);
-       err = write_leb(lnum, alen, buf);
+       err = write_leb(lnum, alen, buf, UBI_SHORTTERM);
        if (err)
                goto out;
 

diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c
index c0c1c296e9444a16bb6ddc59cee5b3474901ad77..9ecf82b58a7f1c1b608173402f38b5b4837fde23 100644 (file)
--- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -95,6 +95,7 @@ struct inum_mapping {
  */
 struct ubifs_info info_;
 static struct ubifs_info *c = &info_;
+static libubi_t ubi;
 
 /* Debug levels are: 0 (none), 1 (statistics), 2 (files) ,3 (more details) */
 int debug_level;
@@ -105,6 +106,7 @@ static int root_len;
 static struct stat root_st;
 static char *output;
 static int out_fd;
+static int out_ubi;
 static int squash_owner;
 
 /* The 'head' (position) which nodes are written */
@@ -154,8 +156,15 @@ static const struct option longopts[] = {
 };
 
 static const char *helptext =
-"Usage: mkfs.ubifs [OPTIONS]\n"
+"Usage: mkfs.ubifs [OPTIONS] target\n"
 "Make a UBIFS file system image from an existing directory tree\n\n"
+"Examples:\n"
+"Build file system from directory /opt/img, writting the result in the ubifs.img file\n"
+"\tmkfs.ubifs -m 512 -e 128KiB -c 100 -r /opt/img ubifs.img\n"
+"The same, but writting directly to an UBI volume\n"
+"\tmkfs.ubifs -r /opt/img /dev/ubi0_0\n"
+"Creating an empty UBIFS filesystem on an UBI volume\n"
+"\tmkfs.ubifs /dev/ubi0_0\n\n"
 "Options:\n"
 "-r, -d, --root=DIR       build file system from directory DIR\n"
 "-m, --min-io-size=SIZE   minimum I/O unit size\n"
@@ -357,11 +366,9 @@ static int validate_options(void)
 {
        int tmp;
 
-       if (!root)
-               return err_msg("root directory was not specified");
        if (!output)
-               return err_msg("no output file specified");
-       if (in_path(root, output))
+               return err_msg("no output file or UBI volume specified");
+       if (root && in_path(root, output))
                return err_msg("output file cannot be in the UBIFS root "
                               "directory");
        if (!is_power_of_2(c->min_io_size))
@@ -467,6 +474,28 @@ static long long get_bytes(const char *str)
 
        return bytes;
 }
+/**
+ * open_ubi - open the UBI volume.
+ * @node: name of the UBI volume character device to fetch information about
+ *
+ * Returns %0 in case of success and %-1 in case of failure
+ */
+static int open_ubi(const char *node)
+{
+       struct stat st;
+
+       if (stat(node, &st) || !S_ISCHR(st.st_mode))
+               return -1;
+
+       ubi = libubi_open();
+       if (!ubi)
+               return -1;
+       if (ubi_get_vol_info(ubi, node, &c->vi))
+               return -1;
+       if (ubi_get_dev_info1(ubi, c->vi.dev_num, &c->di))
+               return -1;
+       return 0;
+}
 
 static int get_options(int argc, char**argv)
 {
@@ -616,6 +645,20 @@ static int get_options(int argc, char**argv)
                }
        }
 
+       if (optind != argc && !output)
+               output = strdup(argv[optind]);
+       if (output)
+               out_ubi = !open_ubi(output);
+
+       if (out_ubi) {
+               c->min_io_size = c->di.min_io_size;
+               c->leb_size = c->vi.leb_size;
+               c->max_leb_cnt = c->vi.rsvd_lebs;
+       }
+
+       if (!output)
+               return err_msg("not output device or file specified");
+
        if (c->min_io_size == -1)
                return err_msg("min. I/O unit was not specified "
                               "(use -h for help)");
@@ -714,22 +757,26 @@ static void prepare_node(void *node, int len)
 }
 
 /**
- * write_leb - copy the image of a LEB to the output file.
+ * write_leb - copy the image of a LEB to the output target.
  * @lnum: LEB number
  * @len: length of data in the buffer
  * @buf: buffer (must be at least c->leb_size bytes)
+ * @dtype: expected data type
  */
-int write_leb(int lnum, int len, void *buf)
+int write_leb(int lnum, int len, void *buf, int dtype)
 {
        off64_t pos = (off64_t)lnum * c->leb_size;
 
        dbg_msg(3, "LEB %d len %d", lnum, len);
+       memset(buf + len, 0xff, c->leb_size - len);
+       if (out_ubi)
+               if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
+                       return sys_err_msg("ubi_leb_change_start failed");
+
        if (lseek64(out_fd, pos, SEEK_SET) != pos)
                return sys_err_msg("lseek64 failed seeking %lld",
                                   (long long)pos);
 
-       memset(buf + len, 0xff, c->leb_size - len);
-
        if (write(out_fd, buf, c->leb_size) != c->leb_size)
                return sys_err_msg("write failed writing %d bytes at pos %lld",
                                   c->leb_size, (long long)pos);
@@ -738,12 +785,13 @@ int write_leb(int lnum, int len, void *buf)
 }
 
 /**
- * write_empty_leb - copy the image of an empty LEB to the output file.
+ * write_empty_leb - copy the image of an empty LEB to the output target.
  * @lnum: LEB number
+ * @dtype: expected data type
  */
-static int write_empty_leb(int lnum)
+static int write_empty_leb(int lnum, int dtype)
 {
-       return write_leb(lnum, 0, leb_buf);
+       return write_leb(lnum, 0, leb_buf, dtype);
 }
 
 /**
@@ -790,8 +838,9 @@ static int do_pad(void *buf, int len)
  * @node: node
  * @len: node length
  * @lnum: LEB number
+ * @dtype: expected data type
  */
-static int write_node(void *node, int len, int lnum)
+static int write_node(void *node, int len, int lnum, int dtype)
 {
        prepare_node(node, len);
 
@@ -799,7 +848,7 @@ static int write_node(void *node, int len, int lnum)
 
        len = do_pad(leb_buf, len);
 
-       return write_leb(lnum, len, leb_buf);
+       return write_leb(lnum, len, leb_buf, dtype);
 }
 
 /**
@@ -909,7 +958,7 @@ static int flush_nodes(void)
        if (!head_offs)
                return 0;
        len = do_pad(leb_buf, head_offs);
-       err = write_leb(head_lnum, len, leb_buf);
+       err = write_leb(head_lnum, len, leb_buf, UBI_UNKNOWN);
        if (err)
                return err;
        set_lprops(head_lnum, head_offs, head_flags);
@@ -1581,14 +1630,20 @@ static int write_data(void)
 {
        int err;
 
-       err = stat(root, &root_st);
-       if (err)
-               return sys_err_msg("bad root file-system directory '%s'", root);
+       if (root) {
+               err = stat(root, &root_st);
+               if (err)
+                       return sys_err_msg("bad root file-system directory '%s'",
+                                          root);
+       } else {
+               root_st.st_mtime = time(NULL);
+               root_st.st_atime = root_st.st_ctime = root_st.st_mtime;
+       }
        root_st.st_uid = root_st.st_gid = 0;
        root_st.st_mode = S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO;
 
        head_flags = 0;
-       err = add_directory(root, UBIFS_ROOT_INO, &root_st, 0);
+       err = add_directory(root, UBIFS_ROOT_INO, &root_st, !root);
        if (err)
                return err;
        err = add_multi_linked_files();
@@ -1831,7 +1886,7 @@ static int set_gc_lnum(void)
        int err;
 
        c->gc_lnum = head_lnum++;
-       err = write_empty_leb(c->gc_lnum);
+       err = write_empty_leb(c->gc_lnum, UBI_LONGTERM);
        if (err)
                return err;
        set_lprops(c->gc_lnum, 0, 0);
@@ -1907,7 +1962,7 @@ static int write_super(void)
        if (c->big_lpt)
                sup.flags |= cpu_to_le32(UBIFS_FLG_BIGLPT);
 
-       return write_node(&sup, UBIFS_SB_NODE_SZ, UBIFS_SB_LNUM);
+       return write_node(&sup, UBIFS_SB_NODE_SZ, UBIFS_SB_LNUM, UBI_LONGTERM);
 }
 
 /**
@@ -1950,11 +2005,13 @@ static int write_master(void)
        mst.total_dark   = cpu_to_le64(c->lst.total_dark);
        mst.leb_cnt      = cpu_to_le32(c->leb_cnt);
 
-       err = write_node(&mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM);
+       err = write_node(&mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM,
+                        UBI_SHORTTERM);
        if (err)
                return err;
 
-       err = write_node(&mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM + 1);
+       err = write_node(&mst, UBIFS_MST_NODE_SZ, UBIFS_MST_LNUM + 1,
+                        UBI_SHORTTERM);
        if (err)
                return err;
 
@@ -1974,14 +2031,14 @@ static int write_log(void)
        cs.ch.node_type = UBIFS_CS_NODE;
        cs.cmt_no = cpu_to_le64(0);
 
-       err = write_node(&cs, UBIFS_CS_NODE_SZ, lnum);
+       err = write_node(&cs, UBIFS_CS_NODE_SZ, lnum, UBI_UNKNOWN);
        if (err)
                return err;
 
        lnum += 1;
 
        for (i = 1; i < c->log_lebs; i++, lnum++) {
-               err = write_empty_leb(lnum);
+               err = write_empty_leb(lnum, UBI_UNKNOWN);
                if (err)
                        return err;
        }
@@ -2002,7 +2059,7 @@ static int write_lpt(void)
 
        lnum = c->nhead_lnum + 1;
        while (lnum <= c->lpt_last) {
-               err = write_empty_leb(lnum++);
+               err = write_empty_leb(lnum++, UBI_SHORTTERM);
                if (err)
                        return err;
        }
@@ -2019,7 +2076,7 @@ static int write_orphan_area(void)
 
        lnum = UBIFS_LOG_LNUM + c->log_lebs + c->lpt_lebs;
        for (i = 0; i < c->orph_lebs; i++, lnum++) {
-               err = write_empty_leb(lnum);
+               err = write_empty_leb(lnum, UBI_SHORTTERM);
                if (err)
                        return err;
        }
@@ -2027,24 +2084,76 @@ static int write_orphan_area(void)
 }
 
 /**
- * open_target - open the output file.
+ * check_volume_empty - check if the UBI volume is empty.
+ *
+ * This function checks if the UBI volume is empty by looking if its LEBs are
+ * mapped or not.
+ *
+ * Returns %0 in case of success, %1 is the volume is not empty,
+ * and a negative error code in case of failure.
+ */
+static int check_volume_empty(void)
+{
+       int lnum, err;
+
+       for (lnum = 0; lnum < c->vi.rsvd_lebs; lnum++) {
+               err = ubi_is_mapped(out_fd, lnum);
+               if (err < 0)
+                       return err;
+               if (err == 1)
+                       return 1;
+       }
+       return 0;
+}
+
+/**
+ * open_target - open the output target.
+ *
+ * Open the output target. The target can be an UBI volume
+ * or a file.
+ *
+ * Returns %0 in case of success and %-1 in case of failure.
  */
 static int open_target(void)
 {
-       out_fd = open(output, O_CREAT | O_RDWR | O_TRUNC,
-                     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
-       if (out_fd == -1)
-               return sys_err_msg("cannot create output file '%s'", output);
+       if (out_ubi) {
+               out_fd = open(output, O_RDWR | O_EXCL);
+
+               if (out_fd == -1)
+                       return sys_err_msg("cannot open the UBI volume '%s'",
+                                          output);
+               if (ubi_set_property(out_fd, UBI_PROP_DIRECT_WRITE, 1))
+                       return sys_err_msg("ubi_set_property failed");
+
+               if (check_volume_empty())
+                       return err_msg("UBI volume is not empty");
+       } else {
+               out_fd = open(output, O_CREAT | O_RDWR | O_TRUNC,
+                             S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
+               if (out_fd == -1)
+                       return sys_err_msg("cannot create output file '%s'",
+                                          output);
+       }
        return 0;
 }
 
+
 /**
- * close_target - close the output file.
+ * close_target - close the output target.
+ *
+ * Close the output target. If the target was an UBI
+ * volume, also close libubi.
+ *
+ * Returns %0 in case of success and %-1 in case of failure.
  */
 static int close_target(void)
 {
-       if (close(out_fd) == -1)
-               return sys_err_msg("cannot close output file '%s'", output);
+       if (ubi)
+               libubi_close(ubi);
+       if (out_fd >= 0 && close(out_fd) == -1)
+               return sys_err_msg("cannot close the target '%s'", output);
+       if (output)
+               free(output);
        return 0;
 }
 

diff --git a/mkfs.ubifs/mkfs.ubifs.h b/mkfs.ubifs/mkfs.ubifs.h
index 6460bd5b2e7b611bee48e24cf3f1346e5ca322f5..16b34c7d9ec5919990db726651965835f12f6403 100644 (file)
--- a/mkfs.ubifs/mkfs.ubifs.h
+++ b/mkfs.ubifs/mkfs.ubifs.h
@@ -46,7 +46,9 @@
 #include <libgen.h>
 #include <ctype.h>
 #include <uuid/uuid.h>
+#include <sys/file.h>
 
+#include "libubi.h"
 #include "crc32.h"
 #include "defs.h"
 #include "crc16.h"
@@ -128,7 +130,7 @@ extern struct ubifs_info info_;
 
 struct hashtable_itr;
 
-int write_leb(int lnum, int len, void *buf);
+int write_leb(int lnum, int len, void *buf, int dtype);
 int parse_devtable(const char *tbl_file);
 struct path_htbl_element *devtbl_find_path(const char *path);
 struct name_htbl_element *devtbl_find_name(struct path_htbl_element *ph_elt,

diff --git a/mkfs.ubifs/ubifs.h b/mkfs.ubifs/ubifs.h
index 79c719278a767859093cf07376656bfa7fa8fc62..5c290469803579de833e3cd60ae036b818204e82 100644 (file)
--- a/mkfs.ubifs/ubifs.h
+++ b/mkfs.ubifs/ubifs.h
@@ -292,6 +292,9 @@ struct ubifs_znode
  * @dead_wm: LEB dead space watermark
  * @dark_wm: LEB dark space watermark
  *
+ * @di: UBI device information
+ * @vi: UBI volume information
+ *
  * @gc_lnum: LEB number used for garbage collection
  * @rp_size: reserved pool size
  *
@@ -366,6 +369,9 @@ struct ubifs_info
        int dead_wm;
        int dark_wm;
 
+       struct ubi_dev_info di;
+       struct ubi_vol_info vi;
+
        int gc_lnum;
        long long rp_size;