From b8878b100d99fe477f207d65ecaeac7a2641c23c Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Mon, 18 Mar 2013 17:49:33 +0100 Subject: [PATCH] --- yaml --- r: 361981 b: refs/heads/master c: 217fd5e709f029c125a9d39de5f13387407f131a h: refs/heads/master i: 361979: 53a2c98a8598def67d615ad937d8f46154dd9739 v: v3 --- [refs] | 2 +- trunk/drivers/block/xen-blkback/blkback.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 666dbe7f96e8..d8471cf3c03d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29d0b218c87ace1078e08bb32c2e72fc96fa3db3 +refs/heads/master: 217fd5e709f029c125a9d39de5f13387407f131a diff --git a/trunk/drivers/block/xen-blkback/blkback.c b/trunk/drivers/block/xen-blkback/blkback.c index 477a17c20820..2cf8381a1c6e 100644 --- a/trunk/drivers/block/xen-blkback/blkback.c +++ b/trunk/drivers/block/xen-blkback/blkback.c @@ -164,7 +164,7 @@ static void make_response(struct xen_blkif *blkif, u64 id, #define foreach_grant_safe(pos, n, rbtree, node) \ for ((pos) = container_of(rb_first((rbtree)), typeof(*(pos)), node), \ - (n) = rb_next(&(pos)->node); \ + (n) = (&(pos)->node != NULL) ? rb_next(&(pos)->node) : NULL; \ &(pos)->node != NULL; \ (pos) = container_of(n, typeof(*(pos)), node), \ (n) = (&(pos)->node != NULL) ? rb_next(&(pos)->node) : NULL)