| Message ID | 20240213095412.453787-1-arnd@kernel.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] ubifs: fix sort function prototype | expand |
在 2024/2/13 17:54, Arnd Bergmann 写道: > From: Arnd Bergmann <arnd@arndb.de> > > 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: 1e51764a3c2a ("UBIFS: add new flash file system") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > fs/ubifs/find.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com> > > diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c > index 873e6e1c92b5..1cb79b167a4f 100644 > --- a/fs/ubifs/find.c > +++ b/fs/ubifs/find.c > @@ -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", >
diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c index 873e6e1c92b5..1cb79b167a4f 100644 --- a/fs/ubifs/find.c +++ b/fs/ubifs/find.c @@ -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",