diff --git a/[refs] b/[refs] index 02174764f68b..08d822acfccd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 542582fce1700c01b12e7945aaf173074e008e3e +refs/heads/master: 38f5f65e9d25b0a7270c337a35c724ca3d56f4d8 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 43f6ef8d696f..3475bb2e03ab 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -1475,10 +1475,6 @@ static void rbd_rq_fn(struct request_queue *q) struct rbd_req_coll *coll; struct ceph_snap_context *snapc; - /* peek at request from block layer */ - if (!rq) - break; - dout("fetched request\n"); /* filter out block requests we don't understand */