gfs2: Rename "gfs_recovery" workqueue to "gfs2_recovery"

Rename the "gfs_recovery" workqueue to "gfs2_recovery", and
gfs_recovery_wq to gfs2_recovery_wq.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/main.c b/fs/gfs2/main.c
index afcb328..69bded8 100644 (file)
--- a/fs/gfs2/main.c
+++ b/fs/gfs2/main.c
@@ -152,9 +152,9 @@ static int __init init_gfs2_fs(void)
                goto fail_shrinker;
 
        error = -ENOMEM;
-       gfs_recovery_wq = alloc_workqueue("gfs_recovery",
+       gfs2_recovery_wq = alloc_workqueue("gfs2_recovery",
                                          WQ_MEM_RECLAIM | WQ_FREEZABLE, 0);
-       if (!gfs_recovery_wq)
+       if (!gfs2_recovery_wq)
                goto fail_wq1;
 
        gfs2_control_wq = alloc_workqueue("gfs2_control",
@@ -194,7 +194,7 @@ fail_mempool:
 fail_wq3:
        destroy_workqueue(gfs2_control_wq);
 fail_wq2:
-       destroy_workqueue(gfs_recovery_wq);
+       destroy_workqueue(gfs2_recovery_wq);
 fail_wq1:
        unregister_shrinker(&gfs2_qd_shrinker);
 fail_shrinker:
@@ -234,7 +234,7 @@ static void __exit exit_gfs2_fs(void)
        gfs2_unregister_debugfs();
        unregister_filesystem(&gfs2_fs_type);
        unregister_filesystem(&gfs2meta_fs_type);
-       destroy_workqueue(gfs_recovery_wq);
+       destroy_workqueue(gfs2_recovery_wq);
        destroy_workqueue(gfs2_control_wq);
        destroy_workqueue(gfs2_freeze_wq);
        list_lru_destroy(&gfs2_qd_lru);

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index 9c7a9f6..5aae026 100644 (file)
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -27,7 +27,7 @@
 #include "util.h"
 #include "dir.h"
 
-struct workqueue_struct *gfs_recovery_wq;
+struct workqueue_struct *gfs2_recovery_wq;
 
 int gfs2_replay_read_block(struct gfs2_jdesc *jd, unsigned int blk,
                           struct buffer_head **bh)
@@ -570,7 +570,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd, bool wait)
                return -EBUSY;
 
        /* we have JDF_RECOVERY, queue should always succeed */
-       rv = queue_work(gfs_recovery_wq, &jd->jd_work);
+       rv = queue_work(gfs2_recovery_wq, &jd->jd_work);
        BUG_ON(!rv);
 
        if (wait)

diff --git a/fs/gfs2/recovery.h b/fs/gfs2/recovery.h
index 0d30f8e..7a0c9d0 100644 (file)
--- a/fs/gfs2/recovery.h
+++ b/fs/gfs2/recovery.h
@@ -9,7 +9,7 @@
 
 #include "incore.h"
 
-extern struct workqueue_struct *gfs_recovery_wq;
+extern struct workqueue_struct *gfs2_recovery_wq;
 
 static inline void gfs2_replay_incr_blk(struct gfs2_jdesc *jd, u32 *blk)
 {