git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
fs
/
ubifs
/
lpt.c
diff --git
a/fs/ubifs/lpt.c
b/fs/ubifs/lpt.c
index
ef5155e
..
6189c74
100644
(file)
--- a/
fs/ubifs/lpt.c
+++ b/
fs/ubifs/lpt.c
@@
-701,8
+701,8
@@
int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
- err = ubi
_leb_change(c->ubi
, lnum++, buf, alen,
- UBI_SHORTTERM);
+ err = ubi
fs_leb_change(c
, lnum++, buf, alen,
+
UBI_SHORTTERM);
if (err)
goto out;
p = buf;
if (err)
goto out;
p = buf;
@@
-732,8
+732,8
@@
int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
set_ltab(c, lnum, c->leb_size - alen,
alen - len);
memset(p, 0xff, alen - len);
set_ltab(c, lnum, c->leb_size - alen,
alen - len);
memset(p, 0xff, alen - len);
- err = ubi
_leb_change(c->ubi
, lnum++, buf, alen,
- UBI_SHORTTERM);
+ err = ubi
fs_leb_change(c
, lnum++, buf, alen,
+
UBI_SHORTTERM);
if (err)
goto out;
p = buf;
if (err)
goto out;
p = buf;
@@
-780,8
+780,8
@@
int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
- err = ubi
_leb_change(c->ubi
, lnum++, buf, alen,
- UBI_SHORTTERM);
+ err = ubi
fs_leb_change(c
, lnum++, buf, alen,
+
UBI_SHORTTERM);
if (err)
goto out;
p = buf;
if (err)
goto out;
p = buf;
@@
-806,7
+806,7
@@
int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
alen = ALIGN(len, c->min_io_size);
set_ltab(c, lnum, c->leb_size - alen, alen - len);
memset(p, 0xff, alen - len);
- err = ubi
_leb_change(c->ubi
, lnum++, buf, alen, UBI_SHORTTERM);
+ err = ubi
fs_leb_change(c
, lnum++, buf, alen, UBI_SHORTTERM);
if (err)
goto out;
p = buf;
if (err)
goto out;
p = buf;
@@
-826,7
+826,7
@@
int ubifs_create_dflt_lpt(struct ubifs_info *c, int *main_lebs, int lpt_first,
/* Write remaining buffer */
memset(p, 0xff, alen - len);
/* Write remaining buffer */
memset(p, 0xff, alen - len);
- err = ubi
_leb_change(c->ubi
, lnum, buf, alen, UBI_SHORTTERM);
+ err = ubi
fs_leb_change(c
, lnum, buf, alen, UBI_SHORTTERM);
if (err)
goto out;
if (err)
goto out;
@@
-1222,7
+1222,7
@@
int ubifs_read_nnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
if (c->big_lpt)
nnode->num = calc_nnode_num_from_parent(c, parent, iip);
} else {
if (c->big_lpt)
nnode->num = calc_nnode_num_from_parent(c, parent, iip);
} else {
- err = ubi
_read(c->ubi, lnum, buf, offs, c->nnode_sz
);
+ err = ubi
fs_leb_read(c, lnum, buf, offs, c->nnode_sz, 1
);
if (err)
goto out;
err = ubifs_unpack_nnode(c, buf, nnode);
if (err)
goto out;
err = ubifs_unpack_nnode(c, buf, nnode);
@@
-1247,6
+1247,7
@@
int ubifs_read_nnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
out:
ubifs_err("error %d reading nnode at %d:%d", err, lnum, offs);
out:
ubifs_err("error %d reading nnode at %d:%d", err, lnum, offs);
+ dbg_dump_stack();
kfree(nnode);
return err;
}
kfree(nnode);
return err;
}
@@
-1290,7
+1291,7
@@
static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
lprops->flags = ubifs_categorize_lprops(c, lprops);
}
} else {
lprops->flags = ubifs_categorize_lprops(c, lprops);
}
} else {
- err = ubi
_read(c->ubi, lnum, buf, offs, c->pnode_sz
);
+ err = ubi
fs_leb_read(c, lnum, buf, offs, c->pnode_sz, 1
);
if (err)
goto out;
err = unpack_pnode(c, buf, pnode);
if (err)
goto out;
err = unpack_pnode(c, buf, pnode);
@@
-1312,6
+1313,7
@@
static int read_pnode(struct ubifs_info *c, struct ubifs_nnode *parent, int iip)
out:
ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs);
dbg_dump_pnode(c, pnode, parent, iip);
out:
ubifs_err("error %d reading pnode at %d:%d", err, lnum, offs);
dbg_dump_pnode(c, pnode, parent, iip);
+ dbg_dump_stack();
dbg_msg("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
kfree(pnode);
return err;
dbg_msg("calc num: %d", calc_pnode_num_from_parent(c, parent, iip));
kfree(pnode);
return err;
@@
-1331,7
+1333,7
@@
static int read_ltab(struct ubifs_info *c)
buf = vmalloc(c->ltab_sz);
if (!buf)
return -ENOMEM;
buf = vmalloc(c->ltab_sz);
if (!buf)
return -ENOMEM;
- err = ubi
_read(c->ubi, c->ltab_lnum, buf, c->ltab_offs, c->ltab_sz
);
+ err = ubi
fs_leb_read(c, c->ltab_lnum, buf, c->ltab_offs, c->ltab_sz, 1
);
if (err)
goto out;
err = unpack_ltab(c, buf);
if (err)
goto out;
err = unpack_ltab(c, buf);
@@
-1354,7
+1356,8
@@
static int read_lsave(struct ubifs_info *c)
buf = vmalloc(c->lsave_sz);
if (!buf)
return -ENOMEM;
buf = vmalloc(c->lsave_sz);
if (!buf)
return -ENOMEM;
- err = ubi_read(c->ubi, c->lsave_lnum, buf, c->lsave_offs, c->lsave_sz);
+ err = ubifs_leb_read(c, c->lsave_lnum, buf, c->lsave_offs,
+ c->lsave_sz, 1);
if (err)
goto out;
err = unpack_lsave(c, buf);
if (err)
goto out;
err = unpack_lsave(c, buf);
@@
-1814,8
+1817,8
@@
static struct ubifs_nnode *scan_get_nnode(struct ubifs_info *c,
if (c->big_lpt)
nnode->num = calc_nnode_num_from_parent(c, parent, iip);
} else {
if (c->big_lpt)
nnode->num = calc_nnode_num_from_parent(c, parent, iip);
} else {
- err = ubi
_read(c->ubi
, branch->lnum, buf, branch->offs,
-
c->nnode_sz
);
+ err = ubi
fs_leb_read(c
, branch->lnum, buf, branch->offs,
+
c->nnode_sz, 1
);
if (err)
return ERR_PTR(err);
err = ubifs_unpack_nnode(c, buf, nnode);
if (err)
return ERR_PTR(err);
err = ubifs_unpack_nnode(c, buf, nnode);
@@
-1883,8
+1886,8
@@
static struct ubifs_pnode *scan_get_pnode(struct ubifs_info *c,
ubifs_assert(branch->lnum >= c->lpt_first &&
branch->lnum <= c->lpt_last);
ubifs_assert(branch->offs >= 0 && branch->offs < c->leb_size);
ubifs_assert(branch->lnum >= c->lpt_first &&
branch->lnum <= c->lpt_last);
ubifs_assert(branch->offs >= 0 && branch->offs < c->leb_size);
- err = ubi
_read(c->ubi
, branch->lnum, buf, branch->offs,
-
c->pnode_sz
);
+ err = ubi
fs_leb_read(c
, branch->lnum, buf, branch->offs,
+
c->pnode_sz, 1
);
if (err)
return ERR_PTR(err);
err = unpack_pnode(c, buf, pnode);
if (err)
return ERR_PTR(err);
err = unpack_pnode(c, buf, pnode);
@@
-2224,7
+2227,7
@@
int dbg_check_lpt_nodes(struct ubifs_info *c, struct ubifs_cnode *cnode,
struct ubifs_cnode *cn;
int num, iip = 0, err;
struct ubifs_cnode *cn;
int num, iip = 0, err;
- if (!
(ubifs_chk_flags & UBIFS_CHK_LPROPS
))
+ if (!
dbg_is_chk_lprops(c
))
return 0;
while (cnode) {
return 0;
while (cnode) {