Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ubifs: fix function pointer cast warnings 

ubifs has a number of callback functions for ubifs_lpt_scan_nolock() using
two different prototypes, either passing a struct scan_data or
a struct ubifs_lp_stats, but the caller expects a void pointer instead.

clang-16 now warns about this:

fs/ubifs/find.c:170:9: error: cast from 'int (*)(struct ubifs_info *, const struct ubifs_lprops *, int, struct scan_data *)' 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]
  170 |                                     (ubifs_lpt_scan_callback)scan_for_dirty_cb,
      |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/ubifs/find.c:449:9: error: cast from 'int (*)(struct ubifs_info *, const struct ubifs_lprops *, int, struct scan_data *)' 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]
  449 |                                     (ubifs_lpt_scan_callback)scan_for_free_cb,
      |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change all of these callback functions to actually take the void * argument
that is passed by their caller.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Arnd Bergmann 2024-02-13 10:54:08 +01:00 committed by Richard Weinberger
parent 60f16e912a
commit ec724e534d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fs/ubifs/find.c
View File

@ -82,8 +82,9 @@ static int valuable(struct ubifs_info *c, const struct ubifs_lprops *lprops)
*/ */
static int scan_for_dirty_cb(struct ubifs_info *c, static int scan_for_dirty_cb(struct ubifs_info *c,
const struct ubifs_lprops *lprops, int in_tree, const struct ubifs_lprops *lprops, int in_tree,
struct scan_data *data) void *arg)
{ {
struct scan_data *data = arg;
int ret = LPT_SCAN_CONTINUE; int ret = LPT_SCAN_CONTINUE;
/* Exclude LEBs that are currently in use */ /* Exclude LEBs that are currently in use */
@ -166,8 +167,7 @@ static const struct ubifs_lprops *scan_for_dirty(struct ubifs_info *c,
data.pick_free = pick_free; data.pick_free = pick_free;
data.lnum = -1; data.lnum = -1;
data.exclude_index = exclude_index; data.exclude_index = exclude_index;
err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_for_dirty_cb,
(ubifs_lpt_scan_callback)scan_for_dirty_cb,
&data); &data);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
@ -349,8 +349,9 @@ int ubifs_find_dirty_leb(struct ubifs_info *c, struct ubifs_lprops *ret_lp,
*/ */
static int scan_for_free_cb(struct ubifs_info *c, static int scan_for_free_cb(struct ubifs_info *c,
const struct ubifs_lprops *lprops, int in_tree, const struct ubifs_lprops *lprops, int in_tree,
struct scan_data *data) void *arg)
{ {
struct scan_data *data = arg;
int ret = LPT_SCAN_CONTINUE; int ret = LPT_SCAN_CONTINUE;
/* Exclude LEBs that are currently in use */ /* Exclude LEBs that are currently in use */
@ -446,7 +447,7 @@ const struct ubifs_lprops *do_find_free_space(struct ubifs_info *c,
data.pick_free = pick_free; data.pick_free = pick_free;
data.lnum = -1; data.lnum = -1;
err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum,
(ubifs_lpt_scan_callback)scan_for_free_cb, scan_for_free_cb,
&data); &data);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
@ -589,8 +590,9 @@ int ubifs_find_free_space(struct ubifs_info *c, int min_space, int *offs,
*/ */
static int scan_for_idx_cb(struct ubifs_info *c, static int scan_for_idx_cb(struct ubifs_info *c,
const struct ubifs_lprops *lprops, int in_tree, const struct ubifs_lprops *lprops, int in_tree,
struct scan_data *data) void *arg)
{ {
struct scan_data *data = arg;
int ret = LPT_SCAN_CONTINUE; int ret = LPT_SCAN_CONTINUE;
/* Exclude LEBs that are currently in use */ /* Exclude LEBs that are currently in use */
@ -625,8 +627,7 @@ static const struct ubifs_lprops *scan_for_leb_for_idx(struct ubifs_info *c)
int err; int err;
data.lnum = -1; data.lnum = -1;
err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_for_idx_cb,
(ubifs_lpt_scan_callback)scan_for_idx_cb,
&data); &data);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
@ -781,8 +782,9 @@ int ubifs_save_dirty_idx_lnums(struct ubifs_info *c)
*/ */
static int scan_dirty_idx_cb(struct ubifs_info *c, static int scan_dirty_idx_cb(struct ubifs_info *c,
const struct ubifs_lprops *lprops, int in_tree, const struct ubifs_lprops *lprops, int in_tree,
struct scan_data *data) void *arg)
{ {
struct scan_data *data = arg;
int ret = LPT_SCAN_CONTINUE; int ret = LPT_SCAN_CONTINUE;
/* Exclude LEBs that are currently in use */ /* Exclude LEBs that are currently in use */
@ -841,8 +843,7 @@ static int find_dirty_idx_leb(struct ubifs_info *c)
if (c->pnodes_have >= c->pnode_cnt) if (c->pnodes_have >= c->pnode_cnt)
/* All pnodes are in memory, so skip scan */ /* All pnodes are in memory, so skip scan */
return -ENOSPC; return -ENOSPC;
err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_dirty_idx_cb,
(ubifs_lpt_scan_callback)scan_dirty_idx_cb,
&data); &data);
if (err) if (err)
return err; return err;

6
fs/ubifs/lprops.c
View File

@ -1014,8 +1014,9 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat,
*/ */
static int scan_check_cb(struct ubifs_info *c, static int scan_check_cb(struct ubifs_info *c,
const struct ubifs_lprops *lp, int in_tree, const struct ubifs_lprops *lp, int in_tree,
struct ubifs_lp_stats *lst) void *arg)
{ {
struct ubifs_lp_stats *lst = arg;
struct ubifs_scan_leb *sleb; struct ubifs_scan_leb *sleb;
struct ubifs_scan_node *snod; struct ubifs_scan_node *snod;
int cat, lnum = lp->lnum, is_idx = 0, used = 0, free, dirty, ret; int cat, lnum = lp->lnum, is_idx = 0, used = 0, free, dirty, ret;
@ -1269,8 +1270,7 @@ int dbg_check_lprops(struct ubifs_info *c)
memset(&lst, 0, sizeof(struct ubifs_lp_stats)); memset(&lst, 0, sizeof(struct ubifs_lp_stats));
err = ubifs_lpt_scan_nolock(c, c->main_first, c->leb_cnt - 1, err = ubifs_lpt_scan_nolock(c, c->main_first, c->leb_cnt - 1,
(ubifs_lpt_scan_callback)scan_check_cb, scan_check_cb, &lst);
&lst);
if (err && err != -ENOSPC) if (err && err != -ENOSPC)
goto out; goto out;