[Cluster-devel] [PATCH] GFS2 - bz 192082: System won't suspend with GFS2 file system mounted

[Abhijith Das]

Abhijith Das wrote:

>Abhijith Das wrote:
>
>  
>
>>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: Abhijith Das <adas at redhat.com>
>>--
>> 
>>
>>    
>>
>NACK! Based on IRC conversations with dct, swhiteho
>
>  
>
Try this one.

diff --git a/fs/gfs2/daemon.c b/fs/gfs2/daemon.c
index 683cb5b..3548d9f 100644
--- a/fs/gfs2/daemon.c
+++ b/fs/gfs2/daemon.c
@@ -16,6 +16,7 @@ #include <linux/kthread.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/lm_interface.h>
+#include <linux/freezer.h>

 #include "gfs2.h"
 #include "incore.h"
@@ -49,6 +50,8 @@ int gfs2_scand(void *data)
        while (!kthread_should_stop()) {
                gfs2_scand_internal(sdp);
                t = gfs2_tune_get(sdp, gt_scand_secs) * HZ;
+               if (freezing(current))
+                       refrigerator();
                schedule_timeout_interruptible(t);
        }

@@ -74,6 +77,8 @@ int gfs2_glockd(void *data)
                wait_event_interruptible(sdp->sd_reclaim_wq,
                                        
(atomic_read(&sdp->sd_reclaim_count) ||
                                         kthread_should_stop()));
+               if (freezing(current))
+                       refrigerator();
        }

        return 0;
@@ -93,6 +98,8 @@ int gfs2_recoverd(void *data)
        while (!kthread_should_stop()) {
                gfs2_check_journals(sdp);
                t = gfs2_tune_get(sdp,  gt_recoverd_secs) * HZ;
+               if (freezing(current))
+                       refrigerator();
                schedule_timeout_interruptible(t);
        }

@@ -141,6 +148,8 @@ int gfs2_logd(void *data)
                }

                t = gfs2_tune_get(sdp, gt_logd_secs) * HZ;
+               if (freezing(current))
+                       refrigerator();
                schedule_timeout_interruptible(t);
        }

@@ -191,6 +200,8 @@ int gfs2_quotad(void *data)
                gfs2_quota_scan(sdp);

                t = gfs2_tune_get(sdp, gt_quotad_secs) * HZ;
+               if (freezing(current))
+                       refrigerator();
                schedule_timeout_interruptible(t);
        }