Commit a520458f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c49c41a4 1f4f4347

drivers/mtd/ubi/cdev.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/mtd/ubi/vtbl.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/ubifs/debug.h

+17 −14
Original line number Diff line number Diff line
@@ -350,10 +350,13 @@ void dbg_debugfs_exit_fs(struct ubifs_info *c); 
#define dbg_msg(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_gen(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_jnl(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_jnlk(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_tnc(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_tnck(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_lp(fmt, ...)        ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_find(fmt, ...)      ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_mnt(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_mntk(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_io(fmt, ...)        ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_cmt(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_budg(fmt, ...)      ubifs_dbg_msg(fmt, ##__VA_ARGS__)