Commit b3657629 authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse

[GFS2] System won't suspend with GFS2 file system mounted

The kernel threads in gfs2, namely gfs2_scand, gfs2_logd, gfs2_quotad,
gfs2_glockd, gfs2_recoverd weren't doing anything when the suspend
mechanism was trying to freeze them.

I put in calls to refrigerator() in the loops for all the daemons and
suspend works as expected.
Signed-off-by: default avatarAbhijith Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 569a7b6c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gfs2_ondisk.h> #include <linux/gfs2_ondisk.h>
#include <linux/lm_interface.h> #include <linux/lm_interface.h>
#include <linux/freezer.h>
#include "gfs2.h" #include "gfs2.h"
#include "incore.h" #include "incore.h"
...@@ -49,6 +50,8 @@ int gfs2_scand(void *data) ...@@ -49,6 +50,8 @@ int gfs2_scand(void *data)
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
gfs2_scand_internal(sdp); gfs2_scand_internal(sdp);
t = gfs2_tune_get(sdp, gt_scand_secs) * HZ; t = gfs2_tune_get(sdp, gt_scand_secs) * HZ;
if (freezing(current))
refrigerator();
schedule_timeout_interruptible(t); schedule_timeout_interruptible(t);
} }
...@@ -74,6 +77,8 @@ int gfs2_glockd(void *data) ...@@ -74,6 +77,8 @@ int gfs2_glockd(void *data)
wait_event_interruptible(sdp->sd_reclaim_wq, wait_event_interruptible(sdp->sd_reclaim_wq,
(atomic_read(&sdp->sd_reclaim_count) || (atomic_read(&sdp->sd_reclaim_count) ||
kthread_should_stop())); kthread_should_stop()));
if (freezing(current))
refrigerator();
} }
return 0; return 0;
...@@ -93,6 +98,8 @@ int gfs2_recoverd(void *data) ...@@ -93,6 +98,8 @@ int gfs2_recoverd(void *data)
while (!kthread_should_stop()) { while (!kthread_should_stop()) {
gfs2_check_journals(sdp); gfs2_check_journals(sdp);
t = gfs2_tune_get(sdp, gt_recoverd_secs) * HZ; t = gfs2_tune_get(sdp, gt_recoverd_secs) * HZ;
if (freezing(current))
refrigerator();
schedule_timeout_interruptible(t); schedule_timeout_interruptible(t);
} }
...@@ -141,6 +148,8 @@ int gfs2_logd(void *data) ...@@ -141,6 +148,8 @@ int gfs2_logd(void *data)
} }
t = gfs2_tune_get(sdp, gt_logd_secs) * HZ; t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
if (freezing(current))
refrigerator();
schedule_timeout_interruptible(t); schedule_timeout_interruptible(t);
} }
...@@ -191,6 +200,8 @@ int gfs2_quotad(void *data) ...@@ -191,6 +200,8 @@ int gfs2_quotad(void *data)
gfs2_quota_scan(sdp); gfs2_quota_scan(sdp);
t = gfs2_tune_get(sdp, gt_quotad_secs) * HZ; t = gfs2_tune_get(sdp, gt_quotad_secs) * HZ;
if (freezing(current))
refrigerator();
schedule_timeout_interruptible(t); schedule_timeout_interruptible(t);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment