Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1227698029 0
# Node ID 0b859c9516ba7831904d5437c7cdc0da07ecf12a
# Parent 6591b4869889bdd705267c47ac855f0c4bb7d75b
# Parent 5012c470f8757e97c2e0f7eccfafcb1e2367443e
Merge with ia64 tree.
---
drivers/xen/blkback/blkback.c | 10 +++++-----
drivers/xen/blktap/blktap.c | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)

diff -r 6591b4869889 -r 0b859c9516ba drivers/xen/blkback/blkback.c
--- a/drivers/xen/blkback/blkback.c Wed Nov 26 10:24:15 2008 +0900
+++ b/drivers/xen/blkback/blkback.c Wed Nov 26 11:13:49 2008 +0000
@@ -317,14 +317,14 @@ static int do_block_io_op(blkif_t *blkif
if (RING_REQUEST_CONS_OVERFLOW(&blk_rings->common, rc))
break;

+ if (kthread_should_stop()) {
+ more_to_do = 1;
+ break;
+ }
+
pending_req = alloc_req();
if (NULL == pending_req) {
blkif->st_oo_req++;
- more_to_do = 1;
- break;
- }
-
- if (kthread_should_stop()) {
more_to_do = 1;
break;
}
diff -r 6591b4869889 -r 0b859c9516ba drivers/xen/blktap/blktap.c
--- a/drivers/xen/blktap/blktap.c Wed Nov 26 10:24:15 2008 +0900
+++ b/drivers/xen/blktap/blktap.c Wed Nov 26 11:13:49 2008 +0000
@@ -1286,14 +1286,14 @@ static int do_block_io_op(blkif_t *blkif
break;
}

+ if (kthread_should_stop()) {
+ more_to_do = 1;
+ break;
+ }
+
pending_req = alloc_req();
if (NULL == pending_req) {
blkif->st_oo_req++;
- more_to_do = 1;
- break;
- }
-
- if (kthread_should_stop()) {
more_to_do = 1;
break;
}

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog