Commit 83407437 authored by Sascha Hauer's avatar Sascha Hauer Committed by Richard Weinberger

ubifs: Drop write_node

write_node() is used only once and can easily be replaced with calls
to ubifs_prepare_node()/write_head() which makes the code a bit shorter.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent e635cf8c
...@@ -228,36 +228,6 @@ static int reserve_space(struct ubifs_info *c, int jhead, int len) ...@@ -228,36 +228,6 @@ static int reserve_space(struct ubifs_info *c, int jhead, int len)
return err; return err;
} }
/**
* write_node - write node to a journal head.
* @c: UBIFS file-system description object
* @jhead: journal head
* @node: node to write
* @len: node length
* @lnum: LEB number written is returned here
* @offs: offset written is returned here
*
* This function writes a node to reserved space of journal head @jhead.
* Returns zero in case of success and a negative error code in case of
* failure.
*/
static int write_node(struct ubifs_info *c, int jhead, void *node, int len,
int *lnum, int *offs)
{
struct ubifs_wbuf *wbuf = &c->jheads[jhead].wbuf;
ubifs_assert(c, jhead != GCHD);
*lnum = c->jheads[jhead].wbuf.lnum;
*offs = c->jheads[jhead].wbuf.offs + c->jheads[jhead].wbuf.used;
dbg_jnl("jhead %s, LEB %d:%d, len %d",
dbg_jhead(jhead), *lnum, *offs, len);
ubifs_prepare_node(c, node, len, 0);
return ubifs_wbuf_write_nolock(wbuf, node, len);
}
/** /**
* write_head - write data to a journal head. * write_head - write data to a journal head.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
...@@ -268,9 +238,9 @@ static int write_node(struct ubifs_info *c, int jhead, void *node, int len, ...@@ -268,9 +238,9 @@ static int write_node(struct ubifs_info *c, int jhead, void *node, int len,
* @offs: offset written is returned here * @offs: offset written is returned here
* @sync: non-zero if the write-buffer has to by synchronized * @sync: non-zero if the write-buffer has to by synchronized
* *
* This function is the same as 'write_node()' but it does not assume the * This function writes data to the reserved space of journal head @jhead.
* buffer it is writing is a node, so it does not prepare it (which means * Returns zero in case of success and a negative error code in case of
* initializing common header and calculating CRC). * failure.
*/ */
static int write_head(struct ubifs_info *c, int jhead, void *buf, int len, static int write_head(struct ubifs_info *c, int jhead, void *buf, int len,
int *lnum, int *offs, int sync) int *lnum, int *offs, int sync)
...@@ -764,7 +734,8 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode, ...@@ -764,7 +734,8 @@ int ubifs_jnl_write_data(struct ubifs_info *c, const struct inode *inode,
if (err) if (err)
goto out_free; goto out_free;
err = write_node(c, DATAHD, data, dlen, &lnum, &offs); ubifs_prepare_node(c, data, dlen, 0);
err = write_head(c, DATAHD, data, dlen, &lnum, &offs, 0);
if (err) if (err)
goto out_release; goto out_release;
ubifs_wbuf_add_ino_nolock(&c->jheads[DATAHD].wbuf, key_inum(c, key)); ubifs_wbuf_add_ino_nolock(&c->jheads[DATAHD].wbuf, key_inum(c, key));
......
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