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

Commit 1f42596e authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by Artem Bityutskiy
Browse files

UBIFS: remove dead code 



Remove dead pieces of code under "if (c->min_io_size == 1)" statement -
we never execute it because in UBIFS 'c->min_io_size' is always at least 8.
This are leftovers from old pre-mainline prototype.

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

fs/ubifs/tnc_commit.c

+30 −76
Original line number Diff line number Diff line
@@ -491,25 +491,6 @@ static int layout_in_empty_space(struct ubifs_info *c) 
		else

			next_len = ubifs_idx_node_sz(c, cnext->child_cnt);



		if (c->min_io_size == 1) {

			buf_offs += ALIGN(len, 8);

			if (next_len) {

				if (buf_offs + next_len <= c->leb_size)

					continue;

				err = ubifs_update_one_lp(c, lnum, 0,

						c->leb_size - buf_offs, 0, 0);

				if (err)

					return err;

				lnum = -1;

				continue;

			}

			err = ubifs_update_one_lp(c, lnum,

					c->leb_size - buf_offs, 0, 0, 0);

			if (err)

				return err;

			break;

		}



		/* Update buffer positions */

		wlen = used + len;

		used += ALIGN(len, 8);
@@ -830,7 +811,7 @@ static int write_index(struct ubifs_info *c) 
	struct ubifs_idx_node *idx;

	struct ubifs_znode *znode, *cnext;

	int i, lnum, offs, len, next_len, buf_len, buf_offs, used;

	int avail, wlen, err, lnum_pos = 0;

	int avail, wlen, err, lnum_pos = 0, blen, nxt_offs;



	cnext = c->enext;

	if (!cnext)
@@ -938,31 +919,7 @@ static int write_index(struct ubifs_info *c) 
		else

			next_len = ubifs_idx_node_sz(c, cnext->child_cnt);



		if (c->min_io_size == 1) {

			/*

			 * Write the prepared index node immediately if there is

			 * no minimum IO size

			 */

			err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs,

					      wlen, UBI_SHORTTERM);

			if (err)

				return err;

			buf_offs += ALIGN(wlen, 8);

			if (next_len) {

				used = 0;

				avail = buf_len;

				if (buf_offs + next_len > c->leb_size) {

					err = ubifs_update_one_lp(c, lnum,

						LPROPS_NC, 0, 0, LPROPS_TAKEN);

					if (err)

						return err;

					lnum = -1;

				}

				continue;

			}

		} else {

			int blen, nxt_offs = buf_offs + used + next_len;



		nxt_offs = buf_offs + used + next_len;

		if (next_len && nxt_offs <= c->leb_size) {

			if (avail > 0)

				continue;
@@ -973,19 +930,17 @@ static int write_index(struct ubifs_info *c) 
			blen = ALIGN(wlen, c->min_io_size);

			ubifs_pad(c, c->cbuf + wlen, blen - wlen);

		}

			/*

			 * The buffer is full or there are no more znodes

			 * to do

			 */

			err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs,

					      blen, UBI_SHORTTERM);



		/* The buffer is full or there are no more znodes to do */

		err = ubifs_leb_write(c, lnum, c->cbuf, buf_offs, blen,

				      UBI_SHORTTERM);

		if (err)

			return err;

		buf_offs += blen;

		if (next_len) {

			if (nxt_offs > c->leb_size) {

					err = ubifs_update_one_lp(c, lnum,

						LPROPS_NC, 0, 0, LPROPS_TAKEN);

				err = ubifs_update_one_lp(c, lnum, LPROPS_NC, 0,

							  0, LPROPS_TAKEN);

				if (err)

					return err;

				lnum = -1;
@@ -997,7 +952,6 @@ static int write_index(struct ubifs_info *c) 
			memmove(c->cbuf, c->cbuf + blen, used);

			continue;

		}

		}

		break;

	}