UBIFS: switch to ubifs_leb_write
Stop using 'ubi_leb_write()' directly and switch to the 'ubifs_leb_write()' helper. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
d304820a1f
commit
987226a5d3
|
@ -523,14 +523,10 @@ int ubifs_wbuf_sync_nolock(struct ubifs_wbuf *wbuf)
|
||||||
dirt = sync_len - wbuf->used;
|
dirt = sync_len - wbuf->used;
|
||||||
if (dirt)
|
if (dirt)
|
||||||
ubifs_pad(c, wbuf->buf + wbuf->used, dirt);
|
ubifs_pad(c, wbuf->buf + wbuf->used, dirt);
|
||||||
err = ubi_leb_write(c->ubi, wbuf->lnum, wbuf->buf, wbuf->offs,
|
err = ubifs_leb_write(c, wbuf->lnum, wbuf->buf, wbuf->offs, sync_len,
|
||||||
sync_len, wbuf->dtype);
|
wbuf->dtype);
|
||||||
if (err) {
|
if (err)
|
||||||
ubifs_err("cannot write %d bytes to LEB %d:%d",
|
|
||||||
sync_len, wbuf->lnum, wbuf->offs);
|
|
||||||
dbg_dump_stack();
|
|
||||||
return err;
|
return err;
|
||||||
}
|
|
||||||
|
|
||||||
spin_lock(&wbuf->lock);
|
spin_lock(&wbuf->lock);
|
||||||
wbuf->offs += sync_len;
|
wbuf->offs += sync_len;
|
||||||
|
@ -722,7 +718,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
|
||||||
if (aligned_len == wbuf->avail) {
|
if (aligned_len == wbuf->avail) {
|
||||||
dbg_io("flush jhead %s wbuf to LEB %d:%d",
|
dbg_io("flush jhead %s wbuf to LEB %d:%d",
|
||||||
dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
|
dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
|
||||||
err = ubi_leb_write(c->ubi, wbuf->lnum, wbuf->buf,
|
err = ubifs_leb_write(c, wbuf->lnum, wbuf->buf,
|
||||||
wbuf->offs, wbuf->size,
|
wbuf->offs, wbuf->size,
|
||||||
wbuf->dtype);
|
wbuf->dtype);
|
||||||
if (err)
|
if (err)
|
||||||
|
@ -759,7 +755,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
|
||||||
dbg_io("flush jhead %s wbuf to LEB %d:%d",
|
dbg_io("flush jhead %s wbuf to LEB %d:%d",
|
||||||
dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
|
dbg_jhead(wbuf->jhead), wbuf->lnum, wbuf->offs);
|
||||||
memcpy(wbuf->buf + wbuf->used, buf, wbuf->avail);
|
memcpy(wbuf->buf + wbuf->used, buf, wbuf->avail);
|
||||||
err = ubi_leb_write(c->ubi, wbuf->lnum, wbuf->buf, wbuf->offs,
|
err = ubifs_leb_write(c, wbuf->lnum, wbuf->buf, wbuf->offs,
|
||||||
wbuf->size, wbuf->dtype);
|
wbuf->size, wbuf->dtype);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -778,7 +774,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
|
||||||
*/
|
*/
|
||||||
dbg_io("write %d bytes to LEB %d:%d",
|
dbg_io("write %d bytes to LEB %d:%d",
|
||||||
wbuf->size, wbuf->lnum, wbuf->offs);
|
wbuf->size, wbuf->lnum, wbuf->offs);
|
||||||
err = ubi_leb_write(c->ubi, wbuf->lnum, buf, wbuf->offs,
|
err = ubifs_leb_write(c, wbuf->lnum, buf, wbuf->offs,
|
||||||
wbuf->size, wbuf->dtype);
|
wbuf->size, wbuf->dtype);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -800,7 +796,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len)
|
||||||
n <<= c->max_write_shift;
|
n <<= c->max_write_shift;
|
||||||
dbg_io("write %d bytes to LEB %d:%d", n, wbuf->lnum,
|
dbg_io("write %d bytes to LEB %d:%d", n, wbuf->lnum,
|
||||||
wbuf->offs);
|
wbuf->offs);
|
||||||
err = ubi_leb_write(c->ubi, wbuf->lnum, buf + written,
|
err = ubifs_leb_write(c, wbuf->lnum, buf + written,
|
||||||
wbuf->offs, n, wbuf->dtype);
|
wbuf->offs, n, wbuf->dtype);
|
||||||
if (err)
|
if (err)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -883,13 +879,9 @@ int ubifs_write_node(struct ubifs_info *c, void *buf, int len, int lnum,
|
||||||
return -EROFS;
|
return -EROFS;
|
||||||
|
|
||||||
ubifs_prepare_node(c, buf, len, 1);
|
ubifs_prepare_node(c, buf, len, 1);
|
||||||
err = ubi_leb_write(c->ubi, lnum, buf, offs, buf_len, dtype);
|
err = ubifs_leb_write(c, lnum, buf, offs, buf_len, dtype);
|
||||||
if (err) {
|
if (err)
|
||||||
ubifs_err("cannot write %d bytes to LEB %d:%d, error %d",
|
|
||||||
buf_len, lnum, offs, err);
|
|
||||||
dbg_dump_node(c, buf);
|
dbg_dump_node(c, buf);
|
||||||
dbg_dump_stack();
|
|
||||||
}
|
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue