ubifs: fix function pointer cast warnings

[linux-2.6-microblaze.git] / fs / ubifs / find.c

diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c
index 1cb79b1..6ebf3c0 100644 (file)
--- a/fs/ubifs/find.c
+++ b/fs/ubifs/find.c
@@ -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,
                             const struct ubifs_lprops *lprops, int in_tree,
-                            struct scan_data *data)
+                            void *arg)
 {
+       struct scan_data *data = arg;
        int ret = LPT_SCAN_CONTINUE;
 
        /* 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.lnum = -1;
        data.exclude_index = exclude_index;
-       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum,
-                                   (ubifs_lpt_scan_callback)scan_for_dirty_cb,
+       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_for_dirty_cb,
                                    &data);
        if (err)
                return ERR_PTR(err);
@@ -349,8 +349,9 @@ out:
  */
 static int scan_for_free_cb(struct ubifs_info *c,
                            const struct ubifs_lprops *lprops, int in_tree,
-                           struct scan_data *data)
+                           void *arg)
 {
+       struct scan_data *data = arg;
        int ret = LPT_SCAN_CONTINUE;
 
        /* 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.lnum = -1;
        err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum,
-                                   (ubifs_lpt_scan_callback)scan_for_free_cb,
+                                   scan_for_free_cb,
                                    &data);
        if (err)
                return ERR_PTR(err);
@@ -589,8 +590,9 @@ out:
  */
 static int scan_for_idx_cb(struct ubifs_info *c,
                           const struct ubifs_lprops *lprops, int in_tree,
-                          struct scan_data *data)
+                          void *arg)
 {
+       struct scan_data *data = arg;
        int ret = LPT_SCAN_CONTINUE;
 
        /* 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;
 
        data.lnum = -1;
-       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum,
-                                   (ubifs_lpt_scan_callback)scan_for_idx_cb,
+       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_for_idx_cb,
                                    &data);
        if (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,
                           const struct ubifs_lprops *lprops, int in_tree,
-                          struct scan_data *data)
+                          void *arg)
 {
+       struct scan_data *data = arg;
        int ret = LPT_SCAN_CONTINUE;
 
        /* 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)
                /* All pnodes are in memory, so skip scan */
                return -ENOSPC;
-       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum,
-                                   (ubifs_lpt_scan_callback)scan_dirty_idx_cb,
+       err = ubifs_lpt_scan_nolock(c, -1, c->lscan_lnum, scan_dirty_idx_cb,
                                    &data);
        if (err)
                return err;