lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix the dark space calculation
  UBIFS: introduce a helper to dump scanning info
This commit is contained in:
Linus Torvalds
2011-11-07 08:52:19 -08:00
parent 31555213f0 7606f85a70
commit cf5e15fbd7
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fs/ubifs/debug.c
View File

@@ -870,6 +870,22 @@ void dbg_dump_lpt_info(struct ubifs_info *c)
spin_unlock(&dbg_lock); spin_unlock(&dbg_lock);
} }
void dbg_dump_sleb(const struct ubifs_info *c,
const struct ubifs_scan_leb *sleb, int offs)
{
struct ubifs_scan_node *snod;
printk(KERN_DEBUG "(pid %d) start dumping scanned data from LEB %d:%d\n",
current->pid, sleb->lnum, offs);
list_for_each_entry(snod, &sleb->nodes, list) {
cond_resched();
printk(KERN_DEBUG "Dumping node at LEB %d:%d len %d\n", sleb->lnum,
snod->offs, snod->len);
dbg_dump_node(c, snod->node);
}
}
void dbg_dump_leb(const struct ubifs_info *c, int lnum) void dbg_dump_leb(const struct ubifs_info *c, int lnum)
{ {
struct ubifs_scan_leb *sleb; struct ubifs_scan_leb *sleb;

5
fs/ubifs/debug.h
View File

@@ -269,6 +269,8 @@ void dbg_dump_lprop(const struct ubifs_info *c, const struct ubifs_lprops *lp);
void dbg_dump_lprops(struct ubifs_info *c); void dbg_dump_lprops(struct ubifs_info *c);
void dbg_dump_lpt_info(struct ubifs_info *c); void dbg_dump_lpt_info(struct ubifs_info *c);
void dbg_dump_leb(const struct ubifs_info *c, int lnum); void dbg_dump_leb(const struct ubifs_info *c, int lnum);
void dbg_dump_sleb(const struct ubifs_info *c,
const struct ubifs_scan_leb *sleb, int offs);
void dbg_dump_znode(const struct ubifs_info *c, void dbg_dump_znode(const struct ubifs_info *c,
const struct ubifs_znode *znode); const struct ubifs_znode *znode);
void dbg_dump_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat); void dbg_dump_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat);
@@ -387,6 +389,9 @@ static inline void dbg_dump_lpt_info(struct ubifs_info *c) { return; }
static inline void dbg_dump_leb(const struct ubifs_info *c, static inline void dbg_dump_leb(const struct ubifs_info *c,
int lnum) { return; } int lnum) { return; }
static inline void static inline void
dbg_dump_sleb(const struct ubifs_info *c,
const struct ubifs_scan_leb *sleb, int offs) { return; }
static inline void
dbg_dump_znode(const struct ubifs_info *c, dbg_dump_znode(const struct ubifs_info *c,
const struct ubifs_znode *znode) { return; } const struct ubifs_znode *znode) { return; }
static inline void dbg_dump_heap(struct ubifs_info *c, static inline void dbg_dump_heap(struct ubifs_info *c,

2
fs/ubifs/recovery.c
View File

@@ -983,7 +983,7 @@ int ubifs_recover_inl_heads(struct ubifs_info *c, void *sbuf)
} }
/** /**
* clean_an_unclean_leb - read and write a LEB to remove corruption. * clean_an_unclean_leb - read and write a LEB to remove corruption.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* @ucleb: unclean LEB information * @ucleb: unclean LEB information
* @sbuf: LEB-sized buffer to use * @sbuf: LEB-sized buffer to use

2
fs/ubifs/sb.c
View File

@@ -247,7 +247,7 @@ static int create_default_filesystem(struct ubifs_info *c)
mst->total_dirty = cpu_to_le64(tmp64); mst->total_dirty = cpu_to_le64(tmp64);
/* The indexing LEB does not contribute to dark space */ /* The indexing LEB does not contribute to dark space */
tmp64 = (c->main_lebs - 1) * c->dark_wm; tmp64 = ((long long)(c->main_lebs - 1) * c->dark_wm);
mst->total_dark = cpu_to_le64(tmp64); mst->total_dark = cpu_to_le64(tmp64);
mst->total_used = cpu_to_le64(UBIFS_INO_NODE_SZ); mst->total_used = cpu_to_le64(UBIFS_INO_NODE_SZ);