Merge branch 'xseg-refactor' of ssh://ray.cslab.ece.ntua.gr/repos/archip into xseg...

Conflicts:
	xseg/peers/kernel/xsegbd.c

diff --cc xseg/peers/kernel/xsegbd.c
index 9b6a7bd,31da61d..c511496
--- 1/xseg/peers/kernel/xsegbd.c
--- 2/xseg/peers/kernel/xsegbd.c
+++ b/xseg/peers/kernel/xsegbd.c
@@@ -733,11 -727,12 +735,12 @@@ static ssize_t xsegbd_cleanup(struct de
                        pending->request = NULL;
                        comp = pending->comp;
                        pending->comp = NULL;
 +                      if (blkreq)
 +                              blk_end_request_all(blkreq, -EIO);
 +                      if (comp)
 +                              complete(comp);
++                      __xq_append_tail(&xsegbd_dev->blk_queue_pending, i);
                }
 -              if (blkreq)
 -                      blk_end_request_all(blkreq, -EIO);
 -              if (comp)
 -                      complete(comp);
 -              __xq_append_tail(&xsegbd_dev->blk_queue_pending, i);
                xlock_release(&xsegbd_dev->blk_queue_pending.lock);
        }