btrfs: get rid of unique workqueue helper functions

[linux-2.6-microblaze.git] / fs / btrfs / async-thread.c

diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index 10a04b9..3f31109 100644 (file)
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -53,16 +53,6 @@ struct btrfs_workqueue {
        struct __btrfs_workqueue *high;
 };
 
-static void normal_work_helper(struct btrfs_work *work);
-
-#define BTRFS_WORK_HELPER(name)                                        \
-noinline_for_stack void btrfs_##name(struct work_struct *arg)          \
-{                                                                      \
-       struct btrfs_work *work = container_of(arg, struct btrfs_work,  \
-                                              normal_work);            \
-       normal_work_helper(work);                                       \
-}
-
 struct btrfs_fs_info *
 btrfs_workqueue_owner(const struct __btrfs_workqueue *wq)
 {
@@ -89,29 +79,6 @@ bool btrfs_workqueue_normal_congested(const struct btrfs_workqueue *wq)
        return atomic_read(&wq->normal->pending) > wq->normal->thresh * 2;
 }
 
-BTRFS_WORK_HELPER(worker_helper);
-BTRFS_WORK_HELPER(delalloc_helper);
-BTRFS_WORK_HELPER(flush_delalloc_helper);
-BTRFS_WORK_HELPER(cache_helper);
-BTRFS_WORK_HELPER(submit_helper);
-BTRFS_WORK_HELPER(fixup_helper);
-BTRFS_WORK_HELPER(endio_helper);
-BTRFS_WORK_HELPER(endio_meta_helper);
-BTRFS_WORK_HELPER(endio_meta_write_helper);
-BTRFS_WORK_HELPER(endio_raid56_helper);
-BTRFS_WORK_HELPER(endio_repair_helper);
-BTRFS_WORK_HELPER(rmw_helper);
-BTRFS_WORK_HELPER(endio_write_helper);
-BTRFS_WORK_HELPER(freespace_write_helper);
-BTRFS_WORK_HELPER(delayed_meta_helper);
-BTRFS_WORK_HELPER(readahead_helper);
-BTRFS_WORK_HELPER(qgroup_rescan_helper);
-BTRFS_WORK_HELPER(extent_refs_helper);
-BTRFS_WORK_HELPER(scrub_helper);
-BTRFS_WORK_HELPER(scrubwrc_helper);
-BTRFS_WORK_HELPER(scrubnc_helper);
-BTRFS_WORK_HELPER(scrubparity_helper);
-
 static struct __btrfs_workqueue *
 __btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info, const char *name,
                        unsigned int flags, int limit_active, int thresh)
@@ -302,12 +269,13 @@ static void run_ordered_work(struct __btrfs_workqueue *wq,
                         * original work item cannot depend on the recycled work
                         * item in that case (see find_worker_executing_work()).
                         *
-                        * Note that the work of one Btrfs filesystem may depend
-                        * on the work of another Btrfs filesystem via, e.g., a
-                        * loop device. Therefore, we must not allow the current
-                        * work item to be recycled until we are really done,
-                        * otherwise we break the above assumption and can
-                        * deadlock.
+                        * Note that different types of Btrfs work can depend on
+                        * each other, and one type of work on one Btrfs
+                        * filesystem may even depend on the same type of work
+                        * on another Btrfs filesystem via, e.g., a loop device.
+                        * Therefore, we must not allow the current work item to
+                        * be recycled until we are really done, otherwise we
+                        * break the above assumption and can deadlock.
                         */
                        free_self = true;
                } else {
@@ -331,8 +299,10 @@ static void run_ordered_work(struct __btrfs_workqueue *wq,
        }
 }
 
-static void normal_work_helper(struct btrfs_work *work)
+static void btrfs_work_helper(struct work_struct *normal_work)
 {
+       struct btrfs_work *work = container_of(normal_work, struct btrfs_work,
+                                              normal_work);
        struct __btrfs_workqueue *wq;
        void *wtag;
        int need_order = 0;
@@ -362,15 +332,13 @@ static void normal_work_helper(struct btrfs_work *work)
                trace_btrfs_all_work_done(wq->fs_info, wtag);
 }
 
-void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t uniq_func,
-                    btrfs_func_t func,
-                    btrfs_func_t ordered_func,
-                    btrfs_func_t ordered_free)
+void btrfs_init_work(struct btrfs_work *work, btrfs_func_t func,
+                    btrfs_func_t ordered_func, btrfs_func_t ordered_free)
 {
        work->func = func;
        work->ordered_func = ordered_func;
        work->ordered_free = ordered_free;
-       INIT_WORK(&work->normal_work, uniq_func);
+       INIT_WORK(&work->normal_work, btrfs_work_helper);
        INIT_LIST_HEAD(&work->ordered_list);
        work->flags = 0;
 }