Commit b793a8c8 authored by hujianyang's avatar hujianyang Committed by Artem Bityutskiy
Browse files

UBIFS: remove useless statements 



This patch removes useless and duplicate statements.

Signed-off-by: default avatarhujianyang <hujianyang@huawei.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent ce6ebdb8

fs/ubifs/lpt.c

+0 −3
Original line number Diff line number Diff line
@@ -1464,7 +1464,6 @@ struct ubifs_lprops *ubifs_lpt_lookup(struct ubifs_info *c, int lnum) 
			return ERR_CAST(nnode);

	}

	iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

	shft -= UBIFS_LPT_FANOUT_SHIFT;

	pnode = ubifs_get_pnode(c, nnode, iip);

	if (IS_ERR(pnode))

		return ERR_CAST(pnode);
@@ -1604,7 +1603,6 @@ struct ubifs_lprops *ubifs_lpt_lookup_dirty(struct ubifs_info *c, int lnum) 
			return ERR_CAST(nnode);

	}

	iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

	shft -= UBIFS_LPT_FANOUT_SHIFT;

	pnode = ubifs_get_pnode(c, nnode, iip);

	if (IS_ERR(pnode))

		return ERR_CAST(pnode);
@@ -1964,7 +1962,6 @@ int ubifs_lpt_scan_nolock(struct ubifs_info *c, int start_lnum, int end_lnum, 
		}

	}

	iip = ((i >> shft) & (UBIFS_LPT_FANOUT - 1));

	shft -= UBIFS_LPT_FANOUT_SHIFT;

	pnode = scan_get_pnode(c, path + h, nnode, iip);

	if (IS_ERR(pnode)) {

		err = PTR_ERR(pnode);

fs/ubifs/lpt_commit.c

+0 −2
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ static int layout_cnodes(struct ubifs_info *c) 
			ubifs_assert(lnum >= c->lpt_first &&

				     lnum <= c->lpt_last);

		}

		done_ltab = 1;

		c->ltab_lnum = lnum;

		c->ltab_offs = offs;

		offs += c->ltab_sz;
@@ -514,7 +513,6 @@ static int write_cnodes(struct ubifs_info *c) 
			if (err)

				return err;

		}

		done_ltab = 1;

		ubifs_pack_ltab(c, buf + offs, c->ltab_cmt);

		offs += c->ltab_sz;

		dbg_chk_lpt_sz(c, 1, c->ltab_sz);

fs/ubifs/orphan.c

+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ static int write_orph_nodes(struct ubifs_info *c, int atomic) 
		int lnum;



		/* Unmap any unused LEBs after consolidation */

		lnum = c->ohead_lnum + 1;

		for (lnum = c->ohead_lnum + 1; lnum <= c->orph_last; lnum++) {

			err = ubifs_leb_unmap(c, lnum);

			if (err)

fs/ubifs/sb.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int validate_sb(struct ubifs_info *c, struct ubifs_sb_node *sup) 
		goto failed;

	}



	if (c->default_compr < 0 || c->default_compr >= UBIFS_COMPR_TYPES_CNT) {

	if (c->default_compr >= UBIFS_COMPR_TYPES_CNT) {

		err = 13;

		goto failed;

	}

fs/ubifs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int validate_inode(struct ubifs_info *c, const struct inode *inode) 
		return 1;

	}



	if (ui->compr_type < 0 || ui->compr_type >= UBIFS_COMPR_TYPES_CNT) {

	if (ui->compr_type >= UBIFS_COMPR_TYPES_CNT) {

		ubifs_err("unknown compression type %d", ui->compr_type);

		return 2;

	}