Skip to content

Commit 5c0dc37

Browse files
author
Andreas Gruenbacher
committed
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>
1 parent e3da6be commit 5c0dc37

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

fs/gfs2/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ static int __init init_gfs2_fs(void)
152152
goto fail_shrinker;
153153

154154
error = -ENOMEM;
155-
gfs_recovery_wq = alloc_workqueue("gfs_recovery",
155+
gfs2_recovery_wq = alloc_workqueue("gfs2_recovery",
156156
WQ_MEM_RECLAIM | WQ_FREEZABLE, 0);
157-
if (!gfs_recovery_wq)
157+
if (!gfs2_recovery_wq)
158158
goto fail_wq1;
159159

160160
gfs2_control_wq = alloc_workqueue("gfs2_control",
@@ -194,7 +194,7 @@ static int __init init_gfs2_fs(void)
194194
fail_wq3:
195195
destroy_workqueue(gfs2_control_wq);
196196
fail_wq2:
197-
destroy_workqueue(gfs_recovery_wq);
197+
destroy_workqueue(gfs2_recovery_wq);
198198
fail_wq1:
199199
unregister_shrinker(&gfs2_qd_shrinker);
200200
fail_shrinker:
@@ -234,7 +234,7 @@ static void __exit exit_gfs2_fs(void)
234234
gfs2_unregister_debugfs();
235235
unregister_filesystem(&gfs2_fs_type);
236236
unregister_filesystem(&gfs2meta_fs_type);
237-
destroy_workqueue(gfs_recovery_wq);
237+
destroy_workqueue(gfs2_recovery_wq);
238238
destroy_workqueue(gfs2_control_wq);
239239
destroy_workqueue(gfs2_freeze_wq);
240240
list_lru_destroy(&gfs2_qd_lru);

fs/gfs2/recovery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "util.h"
2828
#include "dir.h"
2929

30-
struct workqueue_struct *gfs_recovery_wq;
30+
struct workqueue_struct *gfs2_recovery_wq;
3131

3232
int gfs2_replay_read_block(struct gfs2_jdesc *jd, unsigned int blk,
3333
struct buffer_head **bh)
@@ -570,7 +570,7 @@ int gfs2_recover_journal(struct gfs2_jdesc *jd, bool wait)
570570
return -EBUSY;
571571

572572
/* we have JDF_RECOVERY, queue should always succeed */
573-
rv = queue_work(gfs_recovery_wq, &jd->jd_work);
573+
rv = queue_work(gfs2_recovery_wq, &jd->jd_work);
574574
BUG_ON(!rv);
575575

576576
if (wait)

fs/gfs2/recovery.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "incore.h"
1111

12-
extern struct workqueue_struct *gfs_recovery_wq;
12+
extern struct workqueue_struct *gfs2_recovery_wq;
1313

1414
static inline void gfs2_replay_incr_blk(struct gfs2_jdesc *jd, u32 *blk)
1515
{

0 commit comments

Comments
 (0)