Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80214df8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes 

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: gfs2_logd should be using interruptible waits
parents 70057a5a 5f487490

fs/gfs2/log.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -932,7 +932,7 @@ int gfs2_logd(void *data) 




		do {

		do {

			prepare_to_wait(&sdp->sd_logd_waitq, &wait,

			prepare_to_wait(&sdp->sd_logd_waitq, &wait,

					TASK_UNINTERRUPTIBLE);

					TASK_INTERRUPTIBLE);

			if (!gfs2_ail_flush_reqd(sdp) &&

			if (!gfs2_ail_flush_reqd(sdp) &&

			    !gfs2_jrnl_flush_reqd(sdp) &&

			    !gfs2_jrnl_flush_reqd(sdp) &&

			    !kthread_should_stop())

			    !kthread_should_stop())