Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6c6b51 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: remove another unneeded function parameter 



The 'last_reference' parameter of 'pack_inode()' is not really
needed because 'inode->i_nlink' may be tested instead. Zap it.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 1f28681a

fs/ubifs/journal.c

+14 −16
Original line number Original line Diff line number Diff line
@@ -447,13 +447,11 @@ static int get_dent_type(int mode) 
 * @ino: buffer in which to pack inode node

 * @ino: buffer in which to pack inode node

 * @inode: inode to pack

 * @inode: inode to pack

 * @last: indicates the last node of the group

 * @last: indicates the last node of the group

 * @last_reference: non-zero if this is a deletion inode

 */

 */

static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino,

static void pack_inode(struct ubifs_info *c, struct ubifs_ino_node *ino,

		       const struct inode *inode, int last,

		       const struct inode *inode, int last)

		       int last_reference)

{

{

	int data_len = 0;

	int data_len = 0, last_reference = !inode->i_nlink;

	struct ubifs_inode *ui = ubifs_inode(inode);

	struct ubifs_inode *ui = ubifs_inode(inode);





	ino->ch.node_type = UBIFS_INO_NODE;

	ino->ch.node_type = UBIFS_INO_NODE;
@@ -596,9 +594,9 @@ int ubifs_jnl_update(struct ubifs_info *c, const struct inode *dir, 
	ubifs_prep_grp_node(c, dent, dlen, 0);

	ubifs_prep_grp_node(c, dent, dlen, 0);





	ino = (void *)dent + aligned_dlen;

	ino = (void *)dent + aligned_dlen;

	pack_inode(c, ino, inode, 0, last_reference);

	pack_inode(c, ino, inode, 0);

	ino = (void *)ino + aligned_ilen;

	ino = (void *)ino + aligned_ilen;

	pack_inode(c, ino, dir, 1, 0);

	pack_inode(c, ino, dir, 1);





	if (last_reference) {

	if (last_reference) {

		err = ubifs_add_orphan(c, inode->i_ino);

		err = ubifs_add_orphan(c, inode->i_ino);
@@ -781,7 +779,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const struct inode *inode) 
	if (err)

	if (err)

		goto out_free;

		goto out_free;





	pack_inode(c, ino, inode, 1, last_reference);

	pack_inode(c, ino, inode, 1);

	err = write_head(c, BASEHD, ino, len, &lnum, &offs, sync);

	err = write_head(c, BASEHD, ino, len, &lnum, &offs, sync);

	if (err)

	if (err)

		goto out_release;

		goto out_release;
@@ -912,16 +910,16 @@ int ubifs_jnl_rename(struct ubifs_info *c, const struct inode *old_dir, 




	p = (void *)dent2 + aligned_dlen2;

	p = (void *)dent2 + aligned_dlen2;

	if (new_inode) {

	if (new_inode) {

		pack_inode(c, p, new_inode, 0, last_reference);

		pack_inode(c, p, new_inode, 0);

		p += ALIGN(ilen, 8);

		p += ALIGN(ilen, 8);

	}

	}





	if (!move)

	if (!move)

		pack_inode(c, p, old_dir, 1, 0);

		pack_inode(c, p, old_dir, 1);

	else {

	else {

		pack_inode(c, p, old_dir, 0, 0);

		pack_inode(c, p, old_dir, 0);

		p += ALIGN(plen, 8);

		p += ALIGN(plen, 8);

		pack_inode(c, p, new_dir, 1, 0);

		pack_inode(c, p, new_dir, 1);

	}

	}





	if (last_reference) {

	if (last_reference) {
@@ -1126,7 +1124,7 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const struct inode *inode, 
	if (err)

	if (err)

		goto out_free;

		goto out_free;





	pack_inode(c, ino, inode, 0, 0);

	pack_inode(c, ino, inode, 0);

	ubifs_prep_grp_node(c, trun, UBIFS_TRUN_NODE_SZ, dlen ? 0 : 1);

	ubifs_prep_grp_node(c, trun, UBIFS_TRUN_NODE_SZ, dlen ? 0 : 1);

	if (dlen)

	if (dlen)

		ubifs_prep_grp_node(c, dn, dlen, 1);

		ubifs_prep_grp_node(c, dn, dlen, 1);
@@ -1246,9 +1244,9 @@ int ubifs_jnl_delete_xattr(struct ubifs_info *c, const struct inode *host, 
	ubifs_prep_grp_node(c, xent, xlen, 0);

	ubifs_prep_grp_node(c, xent, xlen, 0);





	ino = (void *)xent + aligned_xlen;

	ino = (void *)xent + aligned_xlen;

	pack_inode(c, ino, inode, 0, 1);

	pack_inode(c, ino, inode, 0);

	ino = (void *)ino + UBIFS_INO_NODE_SZ;

	ino = (void *)ino + UBIFS_INO_NODE_SZ;

	pack_inode(c, ino, host, 1, 0);

	pack_inode(c, ino, host, 1);





	err = write_head(c, BASEHD, xent, len, &lnum, &xent_offs, sync);

	err = write_head(c, BASEHD, xent, len, &lnum, &xent_offs, sync);

	if (!sync && !err)

	if (!sync && !err)
@@ -1339,8 +1337,8 @@ int ubifs_jnl_change_xattr(struct ubifs_info *c, const struct inode *inode, 
	if (err)

	if (err)

		goto out_free;

		goto out_free;





	pack_inode(c, ino, host, 0, 0);

	pack_inode(c, ino, host, 0);

	pack_inode(c, (void *)ino + aligned_len1, inode, 1, 0);

	pack_inode(c, (void *)ino + aligned_len1, inode, 1);





	err = write_head(c, BASEHD, ino, aligned_len, &lnum, &offs, 0);

	err = write_head(c, BASEHD, ino, aligned_len, &lnum, &offs, 0);

	if (!sync && !err) {

	if (!sync && !err) {