Commit 6df373b0 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 66fa9912

fs/gfs2/log.c

+5 −12
Original line number Diff line number Diff line
@@ -1301,7 +1301,6 @@ int gfs2_logd(void *data) 
{

	struct gfs2_sbd *sdp = data;

	unsigned long t = 1;

	DEFINE_WAIT(wait);



	while (!kthread_should_stop()) {
@@ -1338,17 +1337,11 @@ int gfs2_logd(void *data) 


		try_to_freeze();



		do {

			prepare_to_wait(&sdp->sd_logd_waitq, &wait,

					TASK_INTERRUPTIBLE);

			if (!gfs2_ail_flush_reqd(sdp) &&

			    !gfs2_jrnl_flush_reqd(sdp) &&

			    !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);

		t = wait_event_interruptible_timeout(sdp->sd_logd_waitq,

				gfs2_ail_flush_reqd(sdp) ||

				gfs2_jrnl_flush_reqd(sdp) ||

				kthread_should_stop(),

				t);

	}



	return 0;