WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [linux-2.6.18-xen] Merge with ia64 tree.

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [linux-2.6.18-xen] Merge with ia64 tree.
From: "Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 26 Nov 2008 12:00:30 -0800
Delivery-date: Wed, 26 Nov 2008 12:02:04 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# 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@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [linux-2.6.18-xen] Merge with ia64 tree., Xen patchbot-linux-2.6.18-xen <=