diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 13:23:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 13:23:42 -0400 |
| commit | 80214df8db6d0ba8172f70122705ef29077fd918 (patch) | |
| tree | edc7009310a30d456c5f876aa55fbeec5b103911 | |
| parent | 70057a5a61a9c703aac0cc51811de8d3384d2889 (diff) | |
| parent | 5f4874903df3562b9d5649fc1cf7b8c6bb238e42 (diff) | |
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
| -rw-r--r-- | fs/gfs2/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index cde1248a6225..ac750bd31a6f 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
| @@ -932,7 +932,7 @@ int gfs2_logd(void *data) | |||
| 932 | 932 | ||
| 933 | do { | 933 | do { |
| 934 | prepare_to_wait(&sdp->sd_logd_waitq, &wait, | 934 | prepare_to_wait(&sdp->sd_logd_waitq, &wait, |
| 935 | TASK_UNINTERRUPTIBLE); | 935 | TASK_INTERRUPTIBLE); |
| 936 | if (!gfs2_ail_flush_reqd(sdp) && | 936 | if (!gfs2_ail_flush_reqd(sdp) && |
| 937 | !gfs2_jrnl_flush_reqd(sdp) && | 937 | !gfs2_jrnl_flush_reqd(sdp) && |
| 938 | !kthread_should_stop()) | 938 | !kthread_should_stop()) |