gfs2: Switch to wait_event in gfs2_logd
In gfs2_logd(), switch from an open-coded wait loop to wait_event_interruptible_timeout(). Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
parent
66fa9912ec
commit
6df373b09b
@ -1301,7 +1301,6 @@ int gfs2_logd(void *data)
|
|||||||
{
|
{
|
||||||
struct gfs2_sbd *sdp = data;
|
struct gfs2_sbd *sdp = data;
|
||||||
unsigned long t = 1;
|
unsigned long t = 1;
|
||||||
DEFINE_WAIT(wait);
|
|
||||||
|
|
||||||
while (!kthread_should_stop()) {
|
while (!kthread_should_stop()) {
|
||||||
|
|
||||||
@ -1338,17 +1337,11 @@ int gfs2_logd(void *data)
|
|||||||
|
|
||||||
try_to_freeze();
|
try_to_freeze();
|
||||||
|
|
||||||
do {
|
t = wait_event_interruptible_timeout(sdp->sd_logd_waitq,
|
||||||
prepare_to_wait(&sdp->sd_logd_waitq, &wait,
|
gfs2_ail_flush_reqd(sdp) ||
|
||||||
TASK_INTERRUPTIBLE);
|
gfs2_jrnl_flush_reqd(sdp) ||
|
||||||
if (!gfs2_ail_flush_reqd(sdp) &&
|
kthread_should_stop(),
|
||||||
!gfs2_jrnl_flush_reqd(sdp) &&
|
t);
|
||||||
!kthread_should_stop())
|
|
||||||
t = schedule_timeout(t);
|
|
||||||
} while(t && !gfs2_ail_flush_reqd(sdp) &&
|
|
||||||
!gfs2_jrnl_flush_reqd(sdp) &&
|
|
||||||
!kthread_should_stop());
|
|
||||||
finish_wait(&sdp->sd_logd_waitq, &wait);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user