diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-09-24 15:37:33 +1000 |
| commit | 4a445f291ac3faa08f56eaeb6e44856b6b72b74c (patch) | |
| tree | b66cc93311dc4c623113a87aa9b40730a21ac18e /fs/gfs2 | |
| parent | cbc60ca04b342a4e1f2a1086a7277c077f07dbed (diff) | |
| parent | a850ea30374ebed32a0724742601861853fde869 (diff) | |
Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core-next
Diffstat (limited to 'fs/gfs2')
| -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 cde1248a622..ac750bd31a6 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()) |