Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a520458fccc5f5dd4d0ed63c0602db2fd3172b21

Authored by Linus Torvalds
2 parents c49c41a413 1f4f43475f
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 3 changed files Side-by-side Diff

drivers/mtd/ubi/cdev.c
Diff comments   View file @ a520458
... ... @@ -632,6 +632,9 @@
632 632 if (req->alignment != 1 && n)
633 633 goto bad;
634 634  
  635 + if (!req->name[0] || !req->name_len)
  636 + goto bad;
  637 +
635 638 if (req->name_len > UBI_VOL_NAME_MAX) {
636 639 err = -ENAMETOOLONG;
637 640 goto bad;
drivers/mtd/ubi/vtbl.c
Diff comments   View file @ a520458
... ... @@ -322,7 +322,7 @@
322 322 goto out_free;
323 323 }
324 324  
325   - vid_hdr->vol_type = UBI_VID_DYNAMIC;
  325 + vid_hdr->vol_type = UBI_LAYOUT_VOLUME_TYPE;
326 326 vid_hdr->vol_id = cpu_to_be32(UBI_LAYOUT_VOLUME_ID);
327 327 vid_hdr->compat = UBI_LAYOUT_VOLUME_COMPAT;
328 328 vid_hdr->data_size = vid_hdr->used_ebs =
... ... @@ -632,7 +632,7 @@
632 632 return -ENOMEM;
633 633  
634 634 vol->reserved_pebs = UBI_LAYOUT_VOLUME_EBS;
635   - vol->alignment = 1;
  635 + vol->alignment = UBI_LAYOUT_VOLUME_ALIGN;
636 636 vol->vol_type = UBI_DYNAMIC_VOLUME;
637 637 vol->name_len = sizeof(UBI_LAYOUT_VOLUME_NAME) - 1;
638 638 memcpy(vol->name, UBI_LAYOUT_VOLUME_NAME, vol->name_len + 1);
... ... @@ -347,20 +347,23 @@
347 347 #define dbg_dump_stack()
348 348 #define ubifs_assert_cmt_locked(c)
349 349  
350   -#define dbg_msg(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
351   -#define dbg_gen(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
352   -#define dbg_jnl(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
353   -#define dbg_tnc(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
354   -#define dbg_lp(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
355   -#define dbg_find(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
356   -#define dbg_mnt(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
357   -#define dbg_io(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
358   -#define dbg_cmt(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
359   -#define dbg_budg(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
360   -#define dbg_log(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
361   -#define dbg_gc(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
362   -#define dbg_scan(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
363   -#define dbg_rcvry(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  350 +#define dbg_msg(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  351 +#define dbg_gen(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  352 +#define dbg_jnl(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  353 +#define dbg_jnlk(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  354 +#define dbg_tnc(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  355 +#define dbg_tnck(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  356 +#define dbg_lp(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  357 +#define dbg_find(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  358 +#define dbg_mnt(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  359 +#define dbg_mntk(key, fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  360 +#define dbg_io(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  361 +#define dbg_cmt(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  362 +#define dbg_budg(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  363 +#define dbg_log(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  364 +#define dbg_gc(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  365 +#define dbg_scan(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
  366 +#define dbg_rcvry(fmt, ...) ubifs_dbg_msg(fmt, ##__VA_ARGS__)
364 367  
365 368 static inline int ubifs_debugging_init(struct ubifs_info *c) { return 0; }
366 369 static inline void ubifs_debugging_exit(struct ubifs_info *c) { return; }