diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 19:23:42 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-17 19:23:42 +0200 |
| commit | 80214df8db6d0ba8172f70122705ef29077fd918 (patch) | |
| tree | edc7009310a30d456c5f876aa55fbeec5b103911 | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | GFS2: gfs2_logd should be using interruptible waits (diff) | |
| download | linux-80214df8db6d0ba8172f70122705ef29077fd918.tar.xz linux-80214df8db6d0ba8172f70122705ef29077fd918.zip | |
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) 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()) |