diff options
author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-10-19 03:13:04 -0400 |
commit | fa251f89903d73989e2f63e13d0eaed1e07ce0da (patch) | |
tree | 3f7fe779941e3b6d67754dd7c44a32f48ea47c74 /fs/gfs2/log.c | |
parent | dd3932eddf428571762596e17b65f5dc92ca361b (diff) | |
parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) |
Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier
Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs/gfs2/log.c')
-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 9c65170e932e..eb01f3575e10 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -923,7 +923,7 @@ int gfs2_logd(void *data) | |||
923 | 923 | ||
924 | do { | 924 | do { |
925 | prepare_to_wait(&sdp->sd_logd_waitq, &wait, | 925 | prepare_to_wait(&sdp->sd_logd_waitq, &wait, |
926 | TASK_UNINTERRUPTIBLE); | 926 | TASK_INTERRUPTIBLE); |
927 | if (!gfs2_ail_flush_reqd(sdp) && | 927 | if (!gfs2_ail_flush_reqd(sdp) && |
928 | !gfs2_jrnl_flush_reqd(sdp) && | 928 | !gfs2_jrnl_flush_reqd(sdp) && |
929 | !kthread_should_stop()) | 929 | !kthread_should_stop()) |