Skip to content

L
linux
Commit 782c3fb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs 

Pull ubifs changes from Artem Bityutskiy:
 "No big changes for 3.7 in UBIFS:
   - Error reporting and debug printing improvements
   - Power cut emulation fixes
   - Minor cleanups"

Fix trivial conflict in fs/ubifs/debug.c due to the user namespace
changes.

* tag 'upstream-3.7-rc1' of git://git.infradead.org/linux-ubifs:
  UBIFS: print less
  UBIFS: use pr_ helper instead of printk
  UBIFS: comply with coding style
  UBIFS: use __aligned() attribute
  UBIFS: remove __DATE__ and __TIME__
  UBIFS: fix power cut emulation for mtdram
  UBIFS: improve scanning debug output
  UBIFS: always print full error reports
  UBIFS: print PID in debug messages
parents 60c7b4df 3668b70f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 451 additions and 578 deletions
fs/ubifs/budget.c
View file @ 782c3fb2
...@@ -342,9 +342,8 @@ static int do_budget_space(struct ubifs_info *c) ...@@ -342,9 +342,8 @@ static int do_budget_space(struct ubifs_info *c)
lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt - lebs = c->lst.empty_lebs + c->freeable_cnt + c->idx_gc_cnt -
c->lst.taken_empty_lebs; c->lst.taken_empty_lebs;
if (unlikely(rsvd_idx_lebs > lebs)) { if (unlikely(rsvd_idx_lebs > lebs)) {
dbg_budg("out of indexing space: min_idx_lebs %d (old %d), " dbg_budg("out of indexing space: min_idx_lebs %d (old %d), rsvd_idx_lebs %d",
"rsvd_idx_lebs %d", min_idx_lebs, c->bi.min_idx_lebs, min_idx_lebs, c->bi.min_idx_lebs, rsvd_idx_lebs);
rsvd_idx_lebs);
return -ENOSPC; return -ENOSPC;
} }
......
fs/ubifs/commit.c
View file @ 782c3fb2
...@@ -293,8 +293,8 @@ int ubifs_bg_thread(void *info) ...@@ -293,8 +293,8 @@ int ubifs_bg_thread(void *info)
int err; int err;
struct ubifs_info *c = info; struct ubifs_info *c = info;
dbg_msg("background thread \"%s\" started, PID %d", ubifs_msg("background thread \"%s\" started, PID %d",
c->bgt_name, current->pid); c->bgt_name, current->pid);
set_freezable(); set_freezable();
while (1) { while (1) {
...@@ -328,7 +328,7 @@ int ubifs_bg_thread(void *info) ...@@ -328,7 +328,7 @@ int ubifs_bg_thread(void *info)
cond_resched(); cond_resched();
} }
dbg_msg("background thread \"%s\" stops", c->bgt_name); ubifs_msg("background thread \"%s\" stops", c->bgt_name);
return 0; return 0;
} }
...@@ -514,7 +514,7 @@ struct idx_node { ...@@ -514,7 +514,7 @@ struct idx_node {
struct list_head list; struct list_head list;
int iip; int iip;
union ubifs_key upper_key; union ubifs_key upper_key;
struct ubifs_idx_node idx __attribute__((aligned(8))); struct ubifs_idx_node idx __aligned(8);
}; };
/** /**
......
fs/ubifs/compress.c
View file @ 782c3fb2
...@@ -112,8 +112,7 @@ void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len, ...@@ -112,8 +112,7 @@ void ubifs_compress(const void *in_buf, int in_len, void *out_buf, int *out_len,
if (compr->comp_mutex) if (compr->comp_mutex)
mutex_unlock(compr->comp_mutex); mutex_unlock(compr->comp_mutex);
if (unlikely(err)) { if (unlikely(err)) {
ubifs_warn("cannot compress %d bytes, compressor %s, " ubifs_warn("cannot compress %d bytes, compressor %s, error %d, leave data uncompressed",
"error %d, leave data uncompressed",
in_len, compr->name, err); in_len, compr->name, err);
goto no_compr; goto no_compr;
} }
...@@ -176,8 +175,8 @@ int ubifs_decompress(const void *in_buf, int in_len, void *out_buf, ...@@ -176,8 +175,8 @@ int ubifs_decompress(const void *in_buf, int in_len, void *out_buf,
if (compr->decomp_mutex) if (compr->decomp_mutex)
mutex_unlock(compr->decomp_mutex); mutex_unlock(compr->decomp_mutex);
if (err) if (err)
ubifs_err("cannot decompress %d bytes, compressor %s, " ubifs_err("cannot decompress %d bytes, compressor %s, error %d",
"error %d", in_len, compr->name, err); in_len, compr->name, err);
return err; return err;
} }
......
fs/ubifs/debug.c
View file @ 782c3fb2
This diff is collapsed.
fs/ubifs/debug.h
View file @ 782c3fb2
...@@ -150,7 +150,7 @@ struct ubifs_global_debug_info { ...@@ -150,7 +150,7 @@ struct ubifs_global_debug_info {
#define ubifs_assert(expr) do { \ #define ubifs_assert(expr) do { \
if (unlikely(!(expr))) { \ if (unlikely(!(expr))) { \
printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \ pr_crit("UBIFS assert failed in %s at %u (pid %d)\n", \
__func__, __LINE__, current->pid); \ __func__, __LINE__, current->pid); \
dump_stack(); \ dump_stack(); \
} \ } \
...@@ -159,26 +159,23 @@ struct ubifs_global_debug_info { ...@@ -159,26 +159,23 @@ struct ubifs_global_debug_info {
#define ubifs_assert_cmt_locked(c) do { \ #define ubifs_assert_cmt_locked(c) do { \
if (unlikely(down_write_trylock(&(c)->commit_sem))) { \ if (unlikely(down_write_trylock(&(c)->commit_sem))) { \
up_write(&(c)->commit_sem); \ up_write(&(c)->commit_sem); \
printk(KERN_CRIT "commit lock is not locked!\n"); \ pr_crit("commit lock is not locked!\n"); \
ubifs_assert(0); \ ubifs_assert(0); \
} \ } \
} while (0) } while (0)
#define ubifs_dbg_msg(type, fmt, ...) \ #define ubifs_dbg_msg(type, fmt, ...) \
pr_debug("UBIFS DBG " type ": " fmt "\n", ##__VA_ARGS__) pr_debug("UBIFS DBG " type " (pid %d): " fmt "\n", current->pid, \
##__VA_ARGS__)
#define DBG_KEY_BUF_LEN 48 #define DBG_KEY_BUF_LEN 48
#define ubifs_dbg_msg_key(type, key, fmt, ...) do { \ #define ubifs_dbg_msg_key(type, key, fmt, ...) do { \
char __tmp_key_buf[DBG_KEY_BUF_LEN]; \ char __tmp_key_buf[DBG_KEY_BUF_LEN]; \
pr_debug("UBIFS DBG " type ": " fmt "%s\n", ##__VA_ARGS__, \ pr_debug("UBIFS DBG " type " (pid %d): " fmt "%s\n", current->pid, \
##__VA_ARGS__, \
dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \ dbg_snprintf_key(c, key, __tmp_key_buf, DBG_KEY_BUF_LEN)); \
} while (0) } while (0)
/* Just a debugging messages not related to any specific UBIFS subsystem */
#define dbg_msg(fmt, ...) \
printk(KERN_DEBUG "UBIFS DBG (pid %d): %s: " fmt "\n", current->pid, \
__func__, ##__VA_ARGS__)
/* General messages */ /* General messages */
#define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__) #define dbg_gen(fmt, ...) ubifs_dbg_msg("gen", fmt, ##__VA_ARGS__)
/* Additional journal messages */ /* Additional journal messages */
......
fs/ubifs/dir.c
View file @ 782c3fb2
...@@ -980,8 +980,8 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -980,8 +980,8 @@ static int ubifs_rename(struct inode *old_dir, struct dentry *old_dentry,
* separately. * separately.
*/ */
dbg_gen("dent '%.*s' ino %lu in dir ino %lu to dent '%.*s' in " dbg_gen("dent '%.*s' ino %lu in dir ino %lu to dent '%.*s' in dir ino %lu",
"dir ino %lu", old_dentry->d_name.len, old_dentry->d_name.name, old_dentry->d_name.len, old_dentry->d_name.name,
old_inode->i_ino, old_dir->i_ino, new_dentry->d_name.len, old_inode->i_ino, old_dir->i_ino, new_dentry->d_name.len,
new_dentry->d_name.name, new_dir->i_ino); new_dentry->d_name.name, new_dir->i_ino);
ubifs_assert(mutex_is_locked(&old_dir->i_mutex)); ubifs_assert(mutex_is_locked(&old_dir->i_mutex));
......
fs/ubifs/file.c
View file @ 782c3fb2
...@@ -1486,8 +1486,8 @@ static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma, ...@@ -1486,8 +1486,8 @@ static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma,
err = ubifs_budget_space(c, &req); err = ubifs_budget_space(c, &req);
if (unlikely(err)) { if (unlikely(err)) {
if (err == -ENOSPC) if (err == -ENOSPC)
ubifs_warn("out of space for mmapped file " ubifs_warn("out of space for mmapped file (inode number %lu)",
"(inode number %lu)", inode->i_ino); inode->i_ino);
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
} }
......
fs/ubifs/gc.c
View file @ 782c3fb2
...@@ -714,9 +714,9 @@ int ubifs_garbage_collect(struct ubifs_info *c, int anyway) ...@@ -714,9 +714,9 @@ int ubifs_garbage_collect(struct ubifs_info *c, int anyway)
break; break;
} }
dbg_gc("found LEB %d: free %d, dirty %d, sum %d " dbg_gc("found LEB %d: free %d, dirty %d, sum %d (min. space %d)",
"(min. space %d)", lp.lnum, lp.free, lp.dirty, lp.lnum, lp.free, lp.dirty, lp.free + lp.dirty,
lp.free + lp.dirty, min_space); min_space);
space_before = c->leb_size - wbuf->offs - wbuf->used; space_before = c->leb_size - wbuf->offs - wbuf->used;
if (wbuf->lnum == -1) if (wbuf->lnum == -1)
......
fs/ubifs/log.c
View file @ 782c3fb2
...@@ -315,17 +315,15 @@ static void remove_buds(struct ubifs_info *c) ...@@ -315,17 +315,15 @@ static void remove_buds(struct ubifs_info *c)
* heads (non-closed buds). * heads (non-closed buds).
*/ */
c->cmt_bud_bytes += wbuf->offs - bud->start; c->cmt_bud_bytes += wbuf->offs - bud->start;
dbg_log("preserve %d:%d, jhead %s, bud bytes %d, " dbg_log("preserve %d:%d, jhead %s, bud bytes %d, cmt_bud_bytes %lld",
"cmt_bud_bytes %lld", bud->lnum, bud->start, bud->lnum, bud->start, dbg_jhead(bud->jhead),
dbg_jhead(bud->jhead), wbuf->offs - bud->start, wbuf->offs - bud->start, c->cmt_bud_bytes);
c->cmt_bud_bytes);
bud->start = wbuf->offs; bud->start = wbuf->offs;
} else { } else {
c->cmt_bud_bytes += c->leb_size - bud->start; c->cmt_bud_bytes += c->leb_size - bud->start;
dbg_log("remove %d:%d, jhead %s, bud bytes %d, " dbg_log("remove %d:%d, jhead %s, bud bytes %d, cmt_bud_bytes %lld",
"cmt_bud_bytes %lld", bud->lnum, bud->start, bud->lnum, bud->start, dbg_jhead(bud->jhead),
dbg_jhead(bud->jhead), c->leb_size - bud->start, c->leb_size - bud->start, c->cmt_bud_bytes);
c->cmt_bud_bytes);
rb_erase(p1, &c->buds); rb_erase(p1, &c->buds);
/* /*
* If the commit does not finish, the recovery will need * If the commit does not finish, the recovery will need
......
fs/ubifs/lprops.c
View file @ 782c3fb2
...@@ -867,15 +867,15 @@ int dbg_check_cats(struct ubifs_info *c) ...@@ -867,15 +867,15 @@ int dbg_check_cats(struct ubifs_info *c)
list_for_each_entry(lprops, &c->empty_list, list) { list_for_each_entry(lprops, &c->empty_list, list) {
if (lprops->free != c->leb_size) { if (lprops->free != c->leb_size) {
ubifs_err("non-empty LEB %d on empty list " ubifs_err("non-empty LEB %d on empty list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
if (lprops->flags & LPROPS_TAKEN) { if (lprops->flags & LPROPS_TAKEN) {
ubifs_err("taken LEB %d on empty list " ubifs_err("taken LEB %d on empty list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
} }
...@@ -883,15 +883,15 @@ int dbg_check_cats(struct ubifs_info *c) ...@@ -883,15 +883,15 @@ int dbg_check_cats(struct ubifs_info *c)
i = 0; i = 0;
list_for_each_entry(lprops, &c->freeable_list, list) { list_for_each_entry(lprops, &c->freeable_list, list) {
if (lprops->free + lprops->dirty != c->leb_size) { if (lprops->free + lprops->dirty != c->leb_size) {
ubifs_err("non-freeable LEB %d on freeable list " ubifs_err("non-freeable LEB %d on freeable list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
if (lprops->flags & LPROPS_TAKEN) { if (lprops->flags & LPROPS_TAKEN) {
ubifs_err("taken LEB %d on freeable list " ubifs_err("taken LEB %d on freeable list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
i += 1; i += 1;
...@@ -913,21 +913,21 @@ int dbg_check_cats(struct ubifs_info *c) ...@@ -913,21 +913,21 @@ int dbg_check_cats(struct ubifs_info *c)
list_for_each_entry(lprops, &c->frdi_idx_list, list) { list_for_each_entry(lprops, &c->frdi_idx_list, list) {
if (lprops->free + lprops->dirty != c->leb_size) { if (lprops->free + lprops->dirty != c->leb_size) {
ubifs_err("non-freeable LEB %d on frdi_idx list " ubifs_err("non-freeable LEB %d on frdi_idx list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
if (lprops->flags & LPROPS_TAKEN) { if (lprops->flags & LPROPS_TAKEN) {
ubifs_err("taken LEB %d on frdi_idx list " ubifs_err("taken LEB %d on frdi_idx list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
if (!(lprops->flags & LPROPS_INDEX)) { if (!(lprops->flags & LPROPS_INDEX)) {
ubifs_err("non-index LEB %d on frdi_idx list " ubifs_err("non-index LEB %d on frdi_idx list (free %d dirty %d flags %d)",
"(free %d dirty %d flags %d)", lprops->lnum, lprops->lnum, lprops->free, lprops->dirty,
lprops->free, lprops->dirty, lprops->flags); lprops->flags);
return -EINVAL; return -EINVAL;
} }
} }
...@@ -982,9 +982,9 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat, ...@@ -982,9 +982,9 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat,
goto out; goto out;
} }
if (lprops != lp) { if (lprops != lp) {
dbg_msg("lprops %zx lp %zx lprops->lnum %d lp->lnum %d", ubifs_err("lprops %zx lp %zx lprops->lnum %d lp->lnum %d",
(size_t)lprops, (size_t)lp, lprops->lnum, (size_t)lprops, (size_t)lp, lprops->lnum,
lp->lnum); lp->lnum);
err = 4; err = 4;
goto out; goto out;
} }
...@@ -1002,7 +1002,7 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat, ...@@ -1002,7 +1002,7 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat,
} }
out: out:
if (err) { if (err) {
dbg_msg("failed cat %d hpos %d err %d", cat, i, err); ubifs_err("failed cat %d hpos %d err %d", cat, i, err);
dump_stack(); dump_stack();
ubifs_dump_heap(c, heap, cat); ubifs_dump_heap(c, heap, cat);
} }
...@@ -1153,8 +1153,8 @@ static int scan_check_cb(struct ubifs_info *c, ...@@ -1153,8 +1153,8 @@ static int scan_check_cb(struct ubifs_info *c,
if (free > c->leb_size || free < 0 || dirty > c->leb_size || if (free > c->leb_size || free < 0 || dirty > c->leb_size ||
dirty < 0) { dirty < 0) {
ubifs_err("bad calculated accounting for LEB %d: " ubifs_err("bad calculated accounting for LEB %d: free %d, dirty %d",
"free %d, dirty %d", lnum, free, dirty); lnum, free, dirty);
goto out_destroy; goto out_destroy;
} }
...@@ -1200,8 +1200,7 @@ static int scan_check_cb(struct ubifs_info *c, ...@@ -1200,8 +1200,7 @@ static int scan_check_cb(struct ubifs_info *c,
/* Free but not unmapped LEB, it's fine */ /* Free but not unmapped LEB, it's fine */
is_idx = 0; is_idx = 0;
else { else {
ubifs_err("indexing node without indexing " ubifs_err("indexing node without indexing flag");
"flag");
goto out_print; goto out_print;
} }
} }
...@@ -1236,8 +1235,7 @@ static int scan_check_cb(struct ubifs_info *c, ...@@ -1236,8 +1235,7 @@ static int scan_check_cb(struct ubifs_info *c,
return LPT_SCAN_CONTINUE; return LPT_SCAN_CONTINUE;
out_print: out_print:
ubifs_err("bad accounting of LEB %d: free %d, dirty %d flags %#x, " ubifs_err("bad accounting of LEB %d: free %d, dirty %d flags %#x, should be free %d, dirty %d",
"should be free %d, dirty %d",
lnum, lp->free, lp->dirty, lp->flags, free, dirty); lnum, lp->free, lp->dirty, lp->flags, free, dirty);
ubifs_dump_leb(c, lnum); ubifs_dump_leb(c, lnum);
out_destroy: out_destroy:
...@@ -1290,12 +1288,10 @@ int dbg_check_lprops(struct ubifs_info *c) ...@@ -1290,12 +1288,10 @@ int dbg_check_lprops(struct ubifs_info *c)
lst.total_dirty != c->lst.total_dirty || lst.total_dirty != c->lst.total_dirty ||
lst.total_used != c->lst.total_used) { lst.total_used != c->lst.total_used) {
ubifs_err("bad overall accounting"); ubifs_err("bad overall accounting");
ubifs_err("calculated: empty_lebs %d, idx_lebs %d, " ubifs_err("calculated: empty_lebs %d, idx_lebs %d, total_free %lld, total_dirty %lld, total_used %lld",
"total_free %lld, total_dirty %lld, total_used %lld",
lst.empty_lebs, lst.idx_lebs, lst.total_free, lst.empty_lebs, lst.idx_lebs, lst.total_free,
lst.total_dirty, lst.total_used); lst.total_dirty, lst.total_used);
ubifs_err("read from lprops: empty_lebs %d, idx_lebs %d, " ubifs_err("read from lprops: empty_lebs %d, idx_lebs %d, total_free %lld, total_dirty %lld, total_used %lld",
"total_free %lld, total_dirty %lld, total_used %lld",
c->lst.empty_lebs, c->lst.idx_lebs, c->lst.total_free, c->lst.empty_lebs, c->lst.idx_lebs, c->lst.total_free,
c->lst.total_dirty, c->lst.total_used); c->lst.total_dirty, c->lst.total_used);
err = -EINVAL; err = -EINVAL;
......
fs/ubifs/lpt.c
View file @ 782c3fb2
...@@ -1311,7 +1311,7 @@ static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip) ...@@ -1311,7 +1311,7 @@ static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs); ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs);
ubifs_dump_pnode(c, pnode, parent, iip); ubifs_dump_pnode(c, pnode, parent, iip);
dump_stack(); dump_stack();
dbg_msg("calc num: %d", calc_pnode_num_from_parent(c, parent, iip)); ubifs_err("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
kfree(pnode); kfree(pnode);
return err; return err;
} }
...@@ -2237,8 +2237,7 @@ int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode, ...@@ -2237,8 +2237,7 @@ int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode,
/* cnode is a nnode */ /* cnode is a nnode */
num = calc_nnode_num(row, col); num = calc_nnode_num(row, col);
if (cnode->num != num) { if (cnode->num != num) {
ubifs_err("nnode num %d expected %d " ubifs_err("nnode num %d expected %d parent num %d iip %d",
"parent num %d iip %d",
cnode->num, num, cnode->num, num,
(nnode ? nnode->num : 0), cnode->iip); (nnode ? nnode->num : 0), cnode->iip);
return -EINVAL; return -EINVAL;
......
fs/ubifs/lpt_commit.c
View file @ 782c3fb2
...@@ -320,8 +320,8 @@ static int layout_cnodes(struct ubifs_info *c) ...@@ -320,8 +320,8 @@ static int layout_cnodes(struct ubifs_info *c)
return 0; return 0;
no_space: no_space:
ubifs_err("LPT out of space at LEB %d:%d needing %d, done_ltab %d, " ubifs_err("LPT out of space at LEB %d:%d needing %d, done_ltab %d, done_lsave %d",
"done_lsave %d", lnum, offs, len, done_ltab, done_lsave); lnum, offs, len, done_ltab, done_lsave);
ubifs_dump_lpt_info(c); ubifs_dump_lpt_info(c);
ubifs_dump_lpt_lebs(c); ubifs_dump_lpt_lebs(c);
dump_stack(); dump_stack();
...@@ -545,8 +545,8 @@ static int write_cnodes(struct ubifs_info *c) ...@@ -545,8 +545,8 @@ static int write_cnodes(struct ubifs_info *c)
return 0; return 0;
no_space: no_space:
ubifs_err("LPT out of space mismatch at LEB %d:%d needing %d, done_ltab " ubifs_err("LPT out of space mismatch at LEB %d:%d needing %d, done_ltab %d, done_lsave %d",
"%d, done_lsave %d", lnum, offs, len, done_ltab, done_lsave); lnum, offs, len, done_ltab, done_lsave);
ubifs_dump_lpt_info(c); ubifs_dump_lpt_info(c);
ubifs_dump_lpt_lebs(c); ubifs_dump_lpt_lebs(c);
dump_stack(); dump_stack();
...@@ -1662,21 +1662,19 @@ static int dbg_check_ltab_lnum(struct ubifs_info *c, int lnum) ...@@ -1662,21 +1662,19 @@ static int dbg_check_ltab_lnum(struct ubifs_info *c, int lnum)
continue; continue;
} }
if (!dbg_is_all_ff(p, len)) { if (!dbg_is_all_ff(p, len)) {
dbg_msg("invalid empty space in LEB %d at %d", ubifs_err("invalid empty space in LEB %d at %d",
lnum, c->leb_size - len); lnum, c->leb_size - len);
err = -EINVAL; err = -EINVAL;
} }
i = lnum - c->lpt_first; i = lnum - c->lpt_first;
if (len != c->ltab[i].free) { if (len != c->ltab[i].free) {
dbg_msg("invalid free space in LEB %d " ubifs_err("invalid free space in LEB %d (free %d, expected %d)",
"(free %d, expected %d)", lnum, len, c->ltab[i].free);
lnum, len, c->ltab[i].free);
err = -EINVAL; err = -EINVAL;
} }
if (dirty != c->ltab[i].dirty) { if (dirty != c->ltab[i].dirty) {
dbg_msg("invalid dirty space in LEB %d " ubifs_err("invalid dirty space in LEB %d (dirty %d, expected %d)",
"(dirty %d, expected %d)", lnum, dirty, c->ltab[i].dirty);
lnum, dirty, c->ltab[i].dirty);
err = -EINVAL; err = -EINVAL;
} }
goto out; goto out;
...@@ -1888,8 +1886,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum) ...@@ -1888,8 +1886,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
int err, len = c->leb_size, node_type, node_num, node_len, offs; int err, len = c->leb_size, node_type, node_num, node_len, offs;
void *buf, *p; void *buf, *p;
printk(KERN_DEBUG "(pid %d) start dumping LEB %d\n", pr_err("(pid %d) start dumping LEB %d\n", current->pid, lnum);
current->pid, lnum);
buf = p = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL); buf = p = __vmalloc(c->leb_size, GFP_NOFS, PAGE_KERNEL);
if (!buf) { if (!buf) {
ubifs_err("cannot allocate memory to dump LPT"); ubifs_err("cannot allocate memory to dump LPT");
...@@ -1907,14 +1904,14 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum) ...@@ -1907,14 +1904,14 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
pad_len = get_pad_len(c, p, len); pad_len = get_pad_len(c, p, len);
if (pad_len) { if (pad_len) {
printk(KERN_DEBUG "LEB %d:%d, pad %d bytes\n", pr_err("LEB %d:%d, pad %d bytes\n",
lnum, offs, pad_len); lnum, offs, pad_len);
p += pad_len; p += pad_len;
len -= pad_len; len -= pad_len;
continue; continue;
} }
if (len) if (len)
printk(KERN_DEBUG "LEB %d:%d, free %d bytes\n", pr_err("LEB %d:%d, free %d bytes\n",
lnum, offs, len); lnum, offs, len);
break; break;
} }
...@@ -1925,11 +1922,10 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum) ...@@ -1925,11 +1922,10 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
{ {
node_len = c->pnode_sz; node_len = c->pnode_sz;
if (c->big_lpt) if (c->big_lpt)
printk(KERN_DEBUG "LEB %d:%d, pnode num %d\n", pr_err("LEB %d:%d, pnode num %d\n",
lnum, offs, node_num); lnum, offs, node_num);
else else
printk(KERN_DEBUG "LEB %d:%d, pnode\n", pr_err("LEB %d:%d, pnode\n", lnum, offs);
lnum, offs);
break; break;
} }
case UBIFS_LPT_NNODE: case UBIFS_LPT_NNODE:
...@@ -1939,29 +1935,28 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum) ...@@ -1939,29 +1935,28 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
node_len = c->nnode_sz; node_len = c->nnode_sz;
if (c->big_lpt) if (c->big_lpt)
printk(KERN_DEBUG "LEB %d:%d, nnode num %d, ", pr_err("LEB %d:%d, nnode num %d, ",
lnum, offs, node_num); lnum, offs, node_num);
else else
printk(KERN_DEBUG "LEB %d:%d, nnode, ", pr_err("LEB %d:%d, nnode, ",
lnum, offs); lnum, offs);
err = ubifs_unpack_nnode(c, p, &nnode); err = ubifs_unpack_nnode(c, p, &nnode);
for (i = 0; i < UBIFS_LPT_FANOUT; i++) { for (i = 0; i < UBIFS_LPT_FANOUT; i++) {
printk(KERN_CONT "%d:%d", nnode.nbranch[i].lnum, pr_cont("%d:%d", nnode.nbranch[i].lnum,
nnode.nbranch[i].offs); nnode.nbranch[i].offs);
if (i != UBIFS_LPT_FANOUT - 1) if (i != UBIFS_LPT_FANOUT - 1)
printk(KERN_CONT ", "); pr_cont(", ");
} }
printk(KERN_CONT "\n"); pr_cont("\n");
break; break;
} }
case UBIFS_LPT_LTAB: case UBIFS_LPT_LTAB:
node_len = c->ltab_sz; node_len = c->ltab_sz;
printk(KERN_DEBUG "LEB %d:%d, ltab\n", pr_err("LEB %d:%d, ltab\n", lnum, offs);
lnum, offs);
break; break;
case UBIFS_LPT_LSAVE: case UBIFS_LPT_LSAVE:
node_len = c->lsave_sz; node_len = c->lsave_sz;
printk(KERN_DEBUG "LEB %d:%d, lsave len\n", lnum, offs); pr_err("LEB %d:%d, lsave len\n", lnum, offs);
break; break;
default: default:
ubifs_err("LPT node type %d not recognized", node_type); ubifs_err("LPT node type %d not recognized", node_type);
...@@ -1972,8 +1967,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum) ...@@ -1972,8 +1967,7 @@ static void dump_lpt_leb(const struct ubifs_info *c, int lnum)
len -= node_len; len -= node_len;
} }
printk(KERN_DEBUG "(pid %d) finish dumping LEB %d\n", pr_err("(pid %d) finish dumping LEB %d\n", current->pid, lnum);
current->pid, lnum);
out: out:
vfree(buf); vfree(buf);
return; return;
...@@ -1990,12 +1984,10 @@ void ubifs_dump_lpt_lebs(const struct ubifs_info *c) ...@@ -1990,12 +1984,10 @@ void ubifs_dump_lpt_lebs(const struct ubifs_info *c)
{ {
int i; int i;
printk(KERN_DEBUG "(pid %d) start dumping all LPT LEBs\n", pr_err("(pid %d) start dumping all LPT LEBs\n", current->pid);
current->pid);
for (i = 0; i < c->lpt_lebs; i++) for (i = 0; i < c->lpt_lebs; i++)
dump_lpt_leb(c, i + c->lpt_first); dump_lpt_leb(c, i + c->lpt_first);
printk(KERN_DEBUG "(pid %d) finish dumping all LPT LEBs\n", pr_err("(pid %d) finish dumping all LPT LEBs\n", current->pid);
current->pid);
} }
/** /**
......
fs/ubifs/orphan.c
View file @ 782c3fb2
...@@ -562,8 +562,8 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb, ...@@ -562,8 +562,8 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
list_for_each_entry(snod, &sleb->nodes, list) { list_for_each_entry(snod, &sleb->nodes, list) {
if (snod->type != UBIFS_ORPH_NODE) { if (snod->type != UBIFS_ORPH_NODE) {
ubifs_err("invalid node type %d in orphan area at " ubifs_err("invalid node type %d in orphan area at %d:%d",
"%d:%d", snod->type, sleb->lnum, snod->offs); snod->type, sleb->lnum, snod->offs);
ubifs_dump_node(c, snod->node); ubifs_dump_node(c, snod->node);
return -EINVAL; return -EINVAL;
} }
...@@ -589,8 +589,7 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb, ...@@ -589,8 +589,7 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
* number. That makes this orphan node, out of date. * number. That makes this orphan node, out of date.
*/ */
if (!first) { if (!first) {
ubifs_err("out of order commit number %llu in " ubifs_err("out of order commit number %llu in orphan node at %d:%d",
"orphan node at %d:%d",
cmt_no, sleb->lnum, snod->offs); cmt_no, sleb->lnum, snod->offs);
ubifs_dump_node(c, snod->node); ubifs_dump_node(c, snod->node);
return -EINVAL; return -EINVAL;
......
fs/ubifs/recovery.c
View file @ 782c3fb2
...@@ -609,7 +609,8 @@ static void drop_last_node(struct ubifs_scan_leb *sleb, int *offs) ...@@ -609,7 +609,8 @@ static void drop_last_node(struct ubifs_scan_leb *sleb, int *offs)
snod = list_entry(sleb->nodes.prev, struct ubifs_scan_node, snod = list_entry(sleb->nodes.prev, struct ubifs_scan_node,
list); list);
dbg_rcvry("dropping last node at %d:%d", sleb->lnum, snod->offs); dbg_rcvry("dropping last node at %d:%d",
sleb->lnum, snod->offs);
*offs = snod->offs; *offs = snod->offs;
list_del(&snod->list); list_del(&snod->list);
kfree(snod); kfree(snod);
...@@ -702,8 +703,8 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum, ...@@ -702,8 +703,8 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum,
* See header comment for this file for more * See header comment for this file for more
* explanations about the reasons we have this check. * explanations about the reasons we have this check.
*/ */
ubifs_err("corrupt empty space LEB %d:%d, corruption " ubifs_err("corrupt empty space LEB %d:%d, corruption starts at %d",
"starts at %d", lnum, offs, corruption); lnum, offs, corruption);
/* Make sure we dump interesting non-0xFF data */ /* Make sure we dump interesting non-0xFF data */
offs += corruption; offs += corruption;
buf += corruption; buf += corruption;
...@@ -899,8 +900,8 @@ struct ubifs_scan_leb *ubifs_recover_log_leb(struct ubifs_info *c, int lnum, ...@@ -899,8 +900,8 @@ struct ubifs_scan_leb *ubifs_recover_log_leb(struct ubifs_info *c, int lnum,
} }
} }
if (snod->sqnum > cs_sqnum) { if (snod->sqnum > cs_sqnum) {
ubifs_err("unrecoverable log corruption " ubifs_err("unrecoverable log corruption in LEB %d",
"in LEB %d", lnum); lnum);
ubifs_scan_destroy(sleb); ubifs_scan_destroy(sleb);
return ERR_PTR(-EUCLEAN); return ERR_PTR(-EUCLEAN);
} }
......
fs/ubifs/replay.c
View file @ 782c3fb2
...@@ -141,9 +141,9 @@ static int set_bud_lprops(struct ubifs_info *c, struct bud_entry *b) ...@@ -141,9 +141,9 @@ static int set_bud_lprops(struct ubifs_info *c, struct bud_entry *b)
* during the replay. * during the replay.
*/ */
if (dirty != 0) if (dirty != 0)
dbg_msg("LEB %d lp: %d free %d dirty " dbg_mnt("LEB %d lp: %d free %d dirty replay: %d free %d dirty",
"replay: %d free %d dirty", b->bud->lnum, b->bud->lnum, lp->free, lp->dirty, b->free,
lp->free, lp->dirty, b->free, b->dirty); b->dirty);
} }
lp = ubifs_change_lp(c, lp, b->free, dirty + b->dirty, lp = ubifs_change_lp(c, lp, b->free, dirty + b->dirty,
lp->flags | LPROPS_TAKEN, 0); lp->flags | LPROPS_TAKEN, 0);
...@@ -677,7 +677,8 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b) ...@@ -677,7 +677,8 @@ static int replay_bud(struct ubifs_info *c, struct bud_entry *b)
b->dirty = sleb->endpt - offs - used; b->dirty = sleb->endpt - offs - used;
b->free = c->leb_size - sleb->endpt; b->free = c->leb_size - sleb->endpt;
dbg_mnt("bud LEB %d replied: dirty %d, free %d", lnum, b->dirty, b->free); dbg_mnt("bud LEB %d replied: dirty %d, free %d",
lnum, b->dirty, b->free);
out: out:
ubifs_scan_destroy(sleb); ubifs_scan_destroy(sleb);
...@@ -865,8 +866,7 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf) ...@@ -865,8 +866,7 @@ static int replay_log_leb(struct ubifs_info *c, int lnum, int offs, void *sbuf)
goto out_dump; goto out_dump;
} }
if (le64_to_cpu(node->cmt_no) != c->cmt_no) { if (le64_to_cpu(node->cmt_no) != c->cmt_no) {
ubifs_err("first CS node at LEB %d:%d has wrong " ubifs_err("first CS node at LEB %d:%d has wrong commit number %llu expected %llu",
"commit number %llu expected %llu",
lnum, offs, lnum, offs,
(unsigned long long)le64_to_cpu(node->cmt_no), (unsigned long long)le64_to_cpu(node->cmt_no),
c->cmt_no); c->cmt_no);
...@@ -1058,8 +1058,8 @@ int ubifs_replay_journal(struct ubifs_info *c) ...@@ -1058,8 +1058,8 @@ int ubifs_replay_journal(struct ubifs_info *c)
c->bi.uncommitted_idx *= c->max_idx_node_sz; c->bi.uncommitted_idx *= c->max_idx_node_sz;
ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery); ubifs_assert(c->bud_bytes <= c->max_bud_bytes || c->need_recovery);
dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, " dbg_mnt("finished, log head LEB %d:%d, max_sqnum %llu, highest_inum %lu",
"highest_inum %lu", c->lhead_lnum, c->lhead_offs, c->max_sqnum, c->lhead_lnum, c->lhead_offs, c->max_sqnum,
(unsigned long)c->highest_inum); (unsigned long)c->highest_inum);
out: out:
destroy_replay_list(c); destroy_replay_list(c);
......
fs/ubifs/sb.c
View file @ 782c3fb2
...@@ -391,9 +391,8 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup) ...@@ -391,9 +391,8 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
min_leb_cnt += c->lpt_lebs + c->orph_lebs + c->jhead_cnt + 6; min_leb_cnt += c->lpt_lebs + c->orph_lebs + c->jhead_cnt + 6;
if (c->leb_cnt < min_leb_cnt || c->leb_cnt > c->vi.size) { if (c->leb_cnt < min_leb_cnt || c->leb_cnt > c->vi.size) {
ubifs_err("bad LEB count: %d in superblock, %d on UBI volume, " ubifs_err("bad LEB count: %d in superblock, %d on UBI volume, %d minimum required",
"%d minimum required", c->leb_cnt, c->vi.size, c->leb_cnt, c->vi.size, min_leb_cnt);
min_leb_cnt);
goto failed; goto failed;
} }
...@@ -411,15 +410,14 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup) ...@@ -411,15 +410,14 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup)
max_bytes = (long long)c->leb_size * UBIFS_MIN_BUD_LEBS; max_bytes = (long long)c->leb_size * UBIFS_MIN_BUD_LEBS;
if (c->max_bud_bytes < max_bytes) { if (c->max_bud_bytes < max_bytes) {
ubifs_err("too small journal (%lld bytes), must be at least " ubifs_err("too small journal (%lld bytes), must be at least %lld bytes",
"%lld bytes", c->max_bud_bytes, max_bytes); c->max_bud_bytes, max_bytes);
goto failed; goto failed;
} }
max_bytes = (long long)c->leb_size * c->main_lebs; max_bytes = (long long)c->leb_size * c->main_lebs;
if (c->max_bud_bytes > max_bytes) { if (c->max_bud_bytes > max_bytes) {
ubifs_err("too large journal size (%lld bytes), only %lld bytes" ubifs_err("too large journal size (%lld bytes), only %lld bytes available in the main area",
"available in the main area",
c->max_bud_bytes, max_bytes); c->max_bud_bytes, max_bytes);
goto failed; goto failed;
} }
...@@ -549,10 +547,9 @@ int ubifs_read_superblock(struct ubifs_info *c) ...@@ -549,10 +547,9 @@ int ubifs_read_superblock(struct ubifs_info *c)
ubifs_assert(!c->ro_media || c->ro_mount); ubifs_assert(!c->ro_media || c->ro_mount);
if (!c->ro_mount || if (!c->ro_mount ||
c->ro_compat_version > UBIFS_RO_COMPAT_VERSION) { c->ro_compat_version > UBIFS_RO_COMPAT_VERSION) {
ubifs_err("on-flash format version is w%d/r%d, but " ubifs_err("on-flash format version is w%d/r%d, but software only supports up to version w%d/r%d",
"software only supports up to version " c->fmt_version, c->ro_compat_version,
"w%d/r%d", c->fmt_version, UBIFS_FORMAT_VERSION,
c->ro_compat_version, UBIFS_FORMAT_VERSION,
UBIFS_RO_COMPAT_VERSION); UBIFS_RO_COMPAT_VERSION);
if (c->ro_compat_version <= UBIFS_RO_COMPAT_VERSION) { if (c->ro_compat_version <= UBIFS_RO_COMPAT_VERSION) {
ubifs_msg("only R/O mounting is possible"); ubifs_msg("only R/O mounting is possible");
......
fs/ubifs/scan.c
View file @ 782c3fb2
...@@ -75,7 +75,7 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum, ...@@ -75,7 +75,7 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
magic = le32_to_cpu(ch->magic); magic = le32_to_cpu(ch->magic);
if (magic == 0xFFFFFFFF) { if (magic == 0xFFFFFFFF) {
dbg_scan("hit empty space"); dbg_scan("hit empty space at LEB %d:%d", lnum, offs);
return SCANNED_EMPTY_SPACE; return SCANNED_EMPTY_SPACE;
} }
...@@ -85,7 +85,8 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum, ...@@ -85,7 +85,8 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
if (len < UBIFS_CH_SZ) if (len < UBIFS_CH_SZ)
return SCANNED_GARBAGE; return SCANNED_GARBAGE;
dbg_scan("scanning %s", dbg_ntype(ch->node_type)); dbg_scan("scanning %s at LEB %d:%d",
dbg_ntype(ch->node_type), lnum, offs);
if (ubifs_check_node(c, buf, lnum, offs, quiet, 1)) if (ubifs_check_node(c, buf, lnum, offs, quiet, 1))
return SCANNED_A_CORRUPT_NODE; return SCANNED_A_CORRUPT_NODE;
...@@ -114,8 +115,8 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum, ...@@ -114,8 +115,8 @@ int ubifs_scan_a_node(const struct ubifs_info *c, void *buf, int len, int lnum,
return SCANNED_A_BAD_PAD_NODE; return SCANNED_A_BAD_PAD_NODE;
} }
dbg_scan("%d bytes padded, offset now %d", dbg_scan("%d bytes padded at LEB %d:%d, offset now %d", pad_len,
pad_len, ALIGN(offs + node_len + pad_len, 8)); lnum, offs, ALIGN(offs + node_len + pad_len, 8));
return node_len + pad_len; return node_len + pad_len;
} }
...@@ -150,8 +151,8 @@ struct ubifs_scan_leb *ubifs_start_scan(const struct ubifs_info *c, int lnum, ...@@ -150,8 +151,8 @@ struct ubifs_scan_leb *ubifs_start_scan(const struct ubifs_info *c, int lnum,
err = ubifs_leb_read(c, lnum, sbuf + offs, offs, c->leb_size - offs, 0); err = ubifs_leb_read(c, lnum, sbuf + offs, offs, c->leb_size - offs, 0);
if (err && err != -EBADMSG) { if (err && err != -EBADMSG) {
ubifs_err("cannot read %d bytes from LEB %d:%d," ubifs_err("cannot read %d bytes from LEB %d:%d, error %d",
" error %d", c->leb_size - offs, lnum, offs, err); c->leb_size - offs, lnum, offs, err);
kfree(sleb); kfree(sleb);
return ERR_PTR(err); return ERR_PTR(err);
} }
...@@ -240,8 +241,6 @@ void ubifs_scanned_corruption(const struct ubifs_info *c, int lnum, int offs, ...@@ -240,8 +241,6 @@ void ubifs_scanned_corruption(const struct ubifs_info *c, int lnum, int offs,
int len; int len;
ubifs_err("corruption at LEB %d:%d", lnum, offs); ubifs_err("corruption at LEB %d:%d", lnum, offs);
if (dbg_is_tst_rcvry(c))
return;
len = c->leb_size - offs; len = c->leb_size - offs;
if (len > 8192) if (len > 8192)
len = 8192; len = 8192;
......
fs/ubifs/super.c
View file @ 782c3fb2
...@@ -89,9 +89,8 @@ static int validate_inode(struct ubifs_info *c, const struct inode *inode) ...@@ -89,9 +89,8 @@ static int validate_inode(struct ubifs_info *c, const struct inode *inode)
return 5; return 5;
if (!ubifs_compr_present(ui->compr_type)) { if (!ubifs_compr_present(ui->compr_type)) {
ubifs_warn("inode %lu uses '%s' compression, but it was not " ubifs_warn("inode %lu uses '%s' compression, but it was not compiled in",
"compiled in", inode->i_ino, inode->i_ino, ubifs_compr_name(ui->compr_type));
ubifs_compr_name(ui->compr_type));
} }
err = dbg_check_dir(c, inode); err = dbg_check_dir(c, inode);
...@@ -1061,8 +1060,8 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options, ...@@ -1061,8 +1060,8 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
flag = parse_standard_option(p); flag = parse_standard_option(p);
if (!flag) { if (!flag) {
ubifs_err("unrecognized mount option \"%s\" " ubifs_err("unrecognized mount option \"%s\" or missing value",
"or missing value", p); p);
return -EINVAL; return -EINVAL;
} }
sb->s_flags |= flag; sb->s_flags |= flag;
...@@ -1124,8 +1123,8 @@ static void bu_init(struct ubifs_info *c) ...@@ -1124,8 +1123,8 @@ static void bu_init(struct ubifs_info *c)
} }
/* Just disable bulk-read */ /* Just disable bulk-read */
ubifs_warn("Cannot allocate %d bytes of memory for bulk-read, " ubifs_warn("cannot allocate %d bytes of memory for bulk-read, disabling it",
"disabling it", c->max_bu_buf_len); c->max_bu_buf_len);
c->mount_opts.bulk_read = 1; c->mount_opts.bulk_read = 1;
c->bulk_read = 0; c->bulk_read = 0;
return; return;
...@@ -1161,7 +1160,7 @@ static int check_free_space(struct ubifs_info *c) ...@@ -1161,7 +1160,7 @@ static int check_free_space(struct ubifs_info *c)
static int mount_ubifs(struct ubifs_info *c) static int mount_ubifs(struct ubifs_info *c)
{ {
int err; int err;
long long x; long long x, y;
size_t sz; size_t sz;
c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY); c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY);
...@@ -1411,75 +1410,69 @@ static int mount_ubifs(struct ubifs_info *c) ...@@ -1411,75 +1410,69 @@ static int mount_ubifs(struct ubifs_info *c)
c->mounting = 0; c->mounting = 0;
ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"", ubifs_msg("mounted UBI device %d, volume %d, name \"%s\"%s",
c->vi.ubi_num, c->vi.vol_id, c->vi.name); c->vi.ubi_num, c->vi.vol_id, c->vi.name,
if (c->ro_mount) c->ro_mount ? ", R/O mode" : NULL);
ubifs_msg("mounted read-only");
x = (long long)c->main_lebs * c->leb_size; x = (long long)c->main_lebs * c->leb_size;
ubifs_msg("file system size: %lld bytes (%lld KiB, %lld MiB, %d " y = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes;
"LEBs)", x, x >> 10, x >> 20, c->main_lebs); ubifs_msg("LEB size: %d bytes (%d KiB), min./max. I/O unit sizes: %d bytes/%d bytes",
x = (long long)c->log_lebs * c->leb_size + c->max_bud_bytes; c->leb_size, c->leb_size >> 10, c->min_io_size,
ubifs_msg("journal size: %lld bytes (%lld KiB, %lld MiB, %d " c->max_write_size);
"LEBs)", x, x >> 10, x >> 20, c->log_lebs + c->max_bud_cnt); ubifs_msg("FS size: %lld bytes (%lld MiB, %d LEBs), journal size %lld bytes (%lld MiB, %d LEBs)",
ubifs_msg("media format: w%d/r%d (latest is w%d/r%d)", x, x >> 20, c->main_lebs,
y, y >> 20, c->log_lebs + c->max_bud_cnt);
ubifs_msg("reserved for root: %llu bytes (%llu KiB)",
c->report_rp_size, c->report_rp_size >> 10);
ubifs_msg("media format: w%d/r%d (latest is w%d/r%d), UUID %pUB%s",
c->fmt_version, c->ro_compat_version, c->fmt_version, c->ro_compat_version,
UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION); UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION, c->uuid,
ubifs_msg("default compressor: %s", ubifs_compr_name(c->default_compr)); c->big_lpt ? ", big LPT model" : ", small LPT model");
ubifs_msg("reserved for root: %llu bytes (%llu KiB)",
c->report_rp_size, c->report_rp_size >> 10); dbg_gen("default compressor: %s", ubifs_compr_name(c->default_compr));
dbg_gen("data journal heads: %d",
dbg_msg("compiled on: " __DATE__ " at " __TIME__);
dbg_msg("min. I/O unit size: %d bytes", c->min_io_size);
dbg_msg("max. write size: %d bytes", c->max_write_size);
dbg_msg("LEB size: %d bytes (%d KiB)",
c->leb_size, c->leb_size >> 10);
dbg_msg("data journal heads: %d",
c->jhead_cnt - NONDATA_JHEADS_CNT); c->jhead_cnt - NONDATA_JHEADS_CNT);
dbg_msg("UUID: %pUB", c->uuid); dbg_gen("log LEBs: %d (%d - %d)",
dbg_msg("big_lpt %d", c->big_lpt);
dbg_msg("log LEBs: %d (%d - %d)",
c->log_lebs, UBIFS_LOG_LNUM, c->log_last); c->log_lebs, UBIFS_LOG_LNUM, c->log_last);
dbg_msg("LPT area LEBs: %d (%d - %d)", dbg_gen("LPT area LEBs: %d (%d - %d)",
c->lpt_lebs, c->lpt_first, c->lpt_last); c->lpt_lebs, c->lpt_first, c->lpt_last);
dbg_msg("orphan area LEBs: %d (%d - %d)", dbg_gen("orphan area LEBs: %d (%d - %d)",
c->orph_lebs, c->orph_first, c->orph_last); c->orph_lebs, c->orph_first, c->orph_last);
dbg_msg("main area LEBs: %d (%d - %d)", dbg_gen("main area LEBs: %d (%d - %d)",
c->main_lebs, c->main_first, c->leb_cnt - 1); c->main_lebs, c->main_first, c->leb_cnt - 1);
dbg_msg("index LEBs: %d", c->lst.idx_lebs); dbg_gen("index LEBs: %d", c->lst.idx_lebs);
dbg_msg("total index bytes: %lld (%lld KiB, %lld MiB)", dbg_gen("total index bytes: %lld (%lld KiB, %lld MiB)",
c->bi.old_idx_sz, c->bi.old_idx_sz >> 10, c->bi.old_idx_sz, c->bi.old_idx_sz >> 10,
c->bi.old_idx_sz >> 20); c->bi.old_idx_sz >> 20);
dbg_msg("key hash type: %d", c->key_hash_type); dbg_gen("key hash type: %d", c->key_hash_type);
dbg_msg("tree fanout: %d", c->fanout); dbg_gen("tree fanout: %d", c->fanout);
dbg_msg("reserved GC LEB: %d", c->gc_lnum); dbg_gen("reserved GC LEB: %d", c->gc_lnum);
dbg_msg("first main LEB: %d", c->main_first); dbg_gen("max. znode size %d", c->max_znode_sz);
dbg_msg("max. znode size %d", c->max_znode_sz); dbg_gen("max. index node size %d", c->max_idx_node_sz);
dbg_msg("max. index node size %d", c->max_idx_node_sz); dbg_gen("node sizes: data %zu, inode %zu, dentry %zu",
dbg_msg("node sizes: data %zu, inode %zu, dentry %zu",
UBIFS_DATA_NODE_SZ, UBIFS_INO_NODE_SZ, UBIFS_DENT_NODE_SZ); UBIFS_DATA_NODE_SZ, UBIFS_INO_NODE_SZ, UBIFS_DENT_NODE_SZ);
dbg_msg("node sizes: trun %zu, sb %zu, master %zu", dbg_gen("node sizes: trun %zu, sb %zu, master %zu",
UBIFS_TRUN_NODE_SZ, UBIFS_SB_NODE_SZ, UBIFS_MST_NODE_SZ); UBIFS_TRUN_NODE_SZ, UBIFS_SB_NODE_SZ, UBIFS_MST_NODE_SZ);
dbg_msg("node sizes: ref %zu, cmt. start %zu, orph %zu", dbg_gen("node sizes: ref %zu, cmt. start %zu, orph %zu",
UBIFS_REF_NODE_SZ, UBIFS_CS_NODE_SZ, UBIFS_ORPH_NODE_SZ); UBIFS_REF_NODE_SZ, UBIFS_CS_NODE_SZ, UBIFS_ORPH_NODE_SZ);
dbg_msg("max. node sizes: data %zu, inode %zu dentry %zu, idx %d", dbg_gen("max. node sizes: data %zu, inode %zu dentry %zu, idx %d",
UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ, UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ,
UBIFS_MAX_DENT_NODE_SZ, ubifs_idx_node_sz(c, c->fanout)); UBIFS_MAX_DENT_NODE_SZ, ubifs_idx_node_sz(c, c->fanout));
dbg_msg("dead watermark: %d", c->dead_wm); dbg_gen("dead watermark: %d", c->dead_wm);
dbg_msg("dark watermark: %d", c->dark_wm); dbg_gen("dark watermark: %d", c->dark_wm);
dbg_msg("LEB overhead: %d", c->leb_overhead); dbg_gen("LEB overhead: %d", c->leb_overhead);
x = (long long)c->main_lebs * c->dark_wm; x = (long long)c->main_lebs * c->dark_wm;
dbg_msg("max. dark space: %lld (%lld KiB, %lld MiB)", dbg_gen("max. dark space: %lld (%lld KiB, %lld MiB)",
x, x >> 10, x >> 20); x, x >> 10, x >> 20);
dbg_msg("maximum bud bytes: %lld (%lld KiB, %lld MiB)", dbg_gen("maximum bud bytes: %lld (%lld KiB, %lld MiB)",
c->max_bud_bytes, c->max_bud_bytes >> 10, c->max_bud_bytes, c->max_bud_bytes >> 10,
c->max_bud_bytes >> 20); c->max_bud_bytes >> 20);
dbg_msg("BG commit bud bytes: %lld (%lld KiB, %lld MiB)", dbg_gen("BG commit bud bytes: %lld (%lld KiB, %lld MiB)",
c->bg_bud_bytes, c->bg_bud_bytes >> 10, c->bg_bud_bytes, c->bg_bud_bytes >> 10,
c->bg_bud_bytes >> 20); c->bg_bud_bytes >> 20);
dbg_msg("current bud bytes %lld (%lld KiB, %lld MiB)", dbg_gen("current bud bytes %lld (%lld KiB, %lld MiB)",
c->bud_bytes, c->bud_bytes >> 10, c->bud_bytes >> 20); c->bud_bytes, c->bud_bytes >> 10, c->bud_bytes >> 20);
dbg_msg("max. seq. number: %llu", c->max_sqnum); dbg_gen("max. seq. number: %llu", c->max_sqnum);
dbg_msg("commit number: %llu", c->cmt_no); dbg_gen("commit number: %llu", c->cmt_no);
return 0; return 0;
...@@ -1564,10 +1557,9 @@ static int ubifs_remount_rw(struct ubifs_info *c) ...@@ -1564,10 +1557,9 @@ static int ubifs_remount_rw(struct ubifs_info *c)
if (c->rw_incompat) { if (c->rw_incompat) {
ubifs_err("the file-system is not R/W-compatible"); ubifs_err("the file-system is not R/W-compatible");
ubifs_msg("on-flash format version is w%d/r%d, but software " ubifs_msg("on-flash format version is w%d/r%d, but software only supports up to version w%d/r%d",
"only supports up to version w%d/r%d", c->fmt_version, c->fmt_version, c->ro_compat_version,
c->ro_compat_version, UBIFS_FORMAT_VERSION, UBIFS_FORMAT_VERSION, UBIFS_RO_COMPAT_VERSION);
UBIFS_RO_COMPAT_VERSION);
return -EROFS; return -EROFS;
} }
...@@ -1828,8 +1820,8 @@ static void ubifs_put_super(struct super_block *sb) ...@@ -1828,8 +1820,8 @@ static void ubifs_put_super(struct super_block *sb)
* next mount, so we just print a message and * next mount, so we just print a message and
* continue to unmount normally. * continue to unmount normally.
*/ */
ubifs_err("failed to write master node, " ubifs_err("failed to write master node, error %d",
"error %d", err); err);
} else { } else {
for (i = 0; i < c->jhead_cnt; i++) for (i = 0; i < c->jhead_cnt; i++)
/* Make sure write-buffer timers are canceled */ /* Make sure write-buffer timers are canceled */
...@@ -2248,8 +2240,7 @@ static int __init ubifs_init(void) ...@@ -2248,8 +2240,7 @@ static int __init ubifs_init(void)
* UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2. * UBIFS_BLOCK_SIZE. It is assumed that both are powers of 2.
*/ */
if (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) { if (PAGE_CACHE_SIZE < UBIFS_BLOCK_SIZE) {
ubifs_err("VFS page cache size is %u bytes, but UBIFS requires" ubifs_err("VFS page cache size is %u bytes, but UBIFS requires at least 4096 bytes",
" at least 4096 bytes",
(unsigned int)PAGE_CACHE_SIZE); (unsigned int)PAGE_CACHE_SIZE);
return -EINVAL; return -EINVAL;
} }
......
fs/ubifs/tnc_misc.c
View file @ 782c3fb2
...@@ -328,8 +328,8 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len, ...@@ -328,8 +328,8 @@ static int read_znode(struct ubifs_info *c, int lnum, int offs, int len,
case UBIFS_XENT_KEY: case UBIFS_XENT_KEY:
break; break;
default: default:
dbg_msg("bad key type at slot %d: %d", ubifs_err("bad key type at slot %d: %d",
i, key_type(c, &zbr->key)); i, key_type(c, &zbr->key));
err = 3; err = 3;
goto out_dump; goto out_dump;
} }
......
fs/ubifs/ubifs.h
View file @ 782c3fb2
...@@ -42,16 +42,15 @@ ...@@ -42,16 +42,15 @@
#define UBIFS_VERSION 1 #define UBIFS_VERSION 1
/* Normal UBIFS messages */ /* Normal UBIFS messages */
#define ubifs_msg(fmt, ...) \ #define ubifs_msg(fmt, ...) pr_notice("UBIFS: " fmt "\n", ##__VA_ARGS__)
printk(KERN_NOTICE "UBIFS: " fmt "\n", ##__VA_ARGS__)
/* UBIFS error messages */ /* UBIFS error messages */
#define ubifs_err(fmt, ...) \ #define ubifs_err(fmt, ...) \
printk(KERN_ERR "UBIFS error (pid %d): %s: " fmt "\n", current->pid, \ pr_err("UBIFS error (pid %d): %s: " fmt "\n", current->pid, \
__func__, ##__VA_ARGS__) __func__, ##__VA_ARGS__)
/* UBIFS warning messages */ /* UBIFS warning messages */
#define ubifs_warn(fmt, ...) \ #define ubifs_warn(fmt, ...) \
printk(KERN_WARNING "UBIFS warning (pid %d): %s: " fmt "\n", \ pr_warn("UBIFS warning (pid %d): %s: " fmt "\n", \
current->pid, __func__, ##__VA_ARGS__) current->pid, __func__, ##__VA_ARGS__)
/* UBIFS file system VFS magic number */ /* UBIFS file system VFS magic number */
#define UBIFS_SUPER_MAGIC 0x24051905 #define UBIFS_SUPER_MAGIC 0x24051905
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7