Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
Browse files Browse the repository at this point in the history
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: gfs2_logd should be using interruptible waits
  • Loading branch information
Linus Torvalds committed Sep 17, 2010
2 parents 70057a5 + 5f48749 commit 80214df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/gfs2/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ int gfs2_logd(void *data)

do {
prepare_to_wait(&sdp->sd_logd_waitq, &wait,
TASK_UNINTERRUPTIBLE);
TASK_INTERRUPTIBLE);
if (!gfs2_ail_flush_reqd(sdp) &&
!gfs2_jrnl_flush_reqd(sdp) &&
!kthread_should_stop())
Expand Down

0 comments on commit 80214df

Please sign in to comment.