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

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

UBIFS: do not use key type in list_sort 



In comparison function for 'list_sort()' we use key type to distinguish between
node types. However, we have a bit simper way to detect node type -
'snod->type'. This more logical to use, comparing to decoding key types. Also
allows to get rid of 2 local variables.

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

fs/ubifs/gc.c

+9 −9
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ int data_nodes_cmp(void *priv, struct list_head *a, struct list_head *b) 
 */

int nondata_nodes_cmp(void *priv, struct list_head *a, struct list_head *b)

{

	int typea, typeb;

	ino_t inuma, inumb;

	struct ubifs_info *c = priv;

	struct ubifs_scan_node *sa, *sb;
@@ -165,21 +164,22 @@ int nondata_nodes_cmp(void *priv, struct list_head *a, struct list_head *b) 
	cond_resched();

	sa = list_entry(a, struct ubifs_scan_node, list);

	sb = list_entry(b, struct ubifs_scan_node, list);

	typea = key_type(c, &sa->key);

	typeb = key_type(c, &sb->key);

	ubifs_assert(typea != UBIFS_DATA_KEY && typeb != UBIFS_DATA_KEY);

	ubifs_assert(sa->type != UBIFS_DATA_NODE &&

		     sb->type != UBIFS_DATA_NODE);



	/* Inodes go before directory entries */

	if (typea == UBIFS_INO_KEY) {

		if (typeb == UBIFS_INO_KEY)

	if (sa->type == UBIFS_INO_NODE) {

		if (sb->type == UBIFS_INO_NODE)

			return sb->len - sa->len;

		return -1;

	}

	if (typeb == UBIFS_INO_KEY)

	if (sb->type == UBIFS_INO_NODE)

		return 1;



	ubifs_assert(typea == UBIFS_DENT_KEY || typea == UBIFS_XENT_KEY);

	ubifs_assert(typeb == UBIFS_DENT_KEY || typeb == UBIFS_XENT_KEY);

	ubifs_assert(sa->type == UBIFS_DENT_NODE ||

		     sa->type == UBIFS_XENT_NODE);

	ubifs_assert(sb->type == UBIFS_DENT_NODE ||

		     sb->type == UBIFS_XENT_NODE);

	inuma = key_inum(c, &sa->key);

	inumb = key_inum(c, &sb->key);