Commit 60f16e91 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Richard Weinberger
Browse files

ubifs: fix sort function prototype 



The global sort() function expects a callback pointer to a function with two
void* arguments, but ubifs has a function with specific object types, which
causes a warning in clang-16 and higher:

fs/ubifs/lprops.c:1272:9: error: cast from 'int (*)(struct ubifs_info *, const struct ubifs_lprops *, int, struct ubifs_lp_stats *)' to 'ubifs_lpt_scan_callback' (aka 'int (*)(struct ubifs_info *, const struct ubifs_lprops *, int, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
 1272 |                                     (ubifs_lpt_scan_callback)scan_check_cb,
      |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change the prototype to the regular one and cast the object pointers
locally instead.

Fixes: 1e51764a ("UBIFS: add new flash file system")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 68a24aba

fs/ubifs/find.c

+4 −5
Original line number Diff line number Diff line
@@ -726,11 +726,10 @@ int ubifs_find_free_leb_for_idx(struct ubifs_info *c) 
	return err;

}



static int cmp_dirty_idx(const struct ubifs_lprops **a,

			 const struct ubifs_lprops **b)

static int cmp_dirty_idx(const void *a, const void *b)

{

	const struct ubifs_lprops *lpa = *a;

	const struct ubifs_lprops *lpb = *b;

	const struct ubifs_lprops *lpa = *(const struct ubifs_lprops **)a;

	const struct ubifs_lprops *lpb = *(const struct ubifs_lprops **)b;



	return lpa->dirty + lpa->free - lpb->dirty - lpb->free;

}
@@ -754,7 +753,7 @@ int ubifs_save_dirty_idx_lnums(struct ubifs_info *c) 
	       sizeof(void *) * c->dirty_idx.cnt);

	/* Sort it so that the dirtiest is now at the end */

	sort(c->dirty_idx.arr, c->dirty_idx.cnt, sizeof(void *),

	     (int (*)(const void *, const void *))cmp_dirty_idx, NULL);

	     cmp_dirty_idx, NULL);

	dbg_find("found %d dirty index LEBs", c->dirty_idx.cnt);

	if (c->dirty_idx.cnt)

		dbg_find("dirtiest index LEB is %d with dirty %d and free %d",