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

Commit ec32816f authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Artem Bityutskiy
Browse files

UBIFS: list usage cleanup 



Trivial cleanup, list_del(); list_add{,_tail}() is equivalent
to list_move{,_tail}(). Semantic patch for coccinelle can be
found at www.cccmz.de/~snakebyte/list_move_tail.spatch

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 2bc275e9

fs/ubifs/log.c

+1 −2
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ static void remove_buds(struct ubifs_info *c) 
				bud->jhead, c->leb_size - bud->start,

				c->cmt_bud_bytes);

			rb_erase(p1, &c->buds);

			list_del(&bud->list);

			/*

			 * If the commit does not finish, the recovery will need

			 * to replay the journal, in which case the old buds
@@ -375,7 +374,7 @@ static void remove_buds(struct ubifs_info *c) 
			 * commit i.e. do not allow them to be garbage

			 * collected.

			 */

			list_add(&bud->list, &c->old_buds);

			list_move(&bud->list, &c->old_buds);

		}

	}

	spin_unlock(&c->buds_lock);

fs/ubifs/shrinker.c

+2 −4
Original line number Diff line number Diff line
@@ -206,8 +206,7 @@ static int shrink_tnc_trees(int nr, int age, int *contention) 
		 * Move this one to the end of the list to provide some

		 * fairness.

		 */

		list_del(&c->infos_list);

		list_add_tail(&c->infos_list, &ubifs_infos);

		list_move_tail(&c->infos_list, &ubifs_infos);

		mutex_unlock(&c->umount_mutex);

		if (freed >= nr)

			break;
@@ -263,8 +262,7 @@ static int kick_a_thread(void) 
			}



			if (i == 1) {

				list_del(&c->infos_list);

				list_add_tail(&c->infos_list, &ubifs_infos);

				list_move_tail(&c->infos_list, &ubifs_infos);

				spin_unlock(&ubifs_infos_lock);



				ubifs_request_bg_commit(c);