From patchwork Fri Aug 24 16:35:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1372191 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 190A3DF28C for ; Fri, 24 Aug 2012 16:35:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964912Ab2HXQfs (ORCPT ); Fri, 24 Aug 2012 12:35:48 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:49774 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964839Ab2HXQfr (ORCPT ); Fri, 24 Aug 2012 12:35:47 -0400 Received: by ialo24 with SMTP id o24so3740650ial.19 for ; Fri, 24 Aug 2012 09:35:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=FWg5YXT50QXY4iMCkqen3hGX5+0Un3dhZMwRfHI0g2Q=; b=eN7Xa6t9g9fuBWAKNoHZqzdoU2K35gPwGU1b7Mgi8nQ5BMMaQpEKtOt0Plk75ZTpF+ OYDK62CO+gbd1TJ/zTWvEPGMM3vZXwSyQGDIdscCRzfnbXL66raBrHDFiDaNiA0wBiay bWX0IYWrBcVLxB2MRbdm1+52DzN0h4mcDvvS1Tja3xWl3RZrjZA1Xt+BTmBPbwa+lyDI 1TjiriSTEs5FzX2MI/kN9Zow0wyXnyjVyLWDXd9ul1WZhiNH7kEU8up7pDZMnk0XN74s xapnum3uNrxlRqrMVtud9US1CvEwYSbAOMOTbzhdAZcKpLrIzx/IH5BeqvsLWZZk7gCA OZ4Q== Received: by 10.50.207.106 with SMTP id lv10mr2919795igc.0.1345826147065; Fri, 24 Aug 2012 09:35:47 -0700 (PDT) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id q1sm656014igj.15.2012.08.24.09.35.42 (version=SSLv3 cipher=OTHER); Fri, 24 Aug 2012 09:35:44 -0700 (PDT) Message-ID: <5037AD5E.5050501@inktank.com> Date: Fri, 24 Aug 2012 11:35:42 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: ceph-devel@vger.kernel.org Subject: [PATCH 09/11] rbd: drop needless test in rbd_rq_fn() References: <5037AB20.4000103@inktank.com> In-Reply-To: <5037AB20.4000103@inktank.com> X-Gm-Message-State: ALoCoQmeUgMPVOqjsDeSmBrFo6Ok2Kq3Lcy8SOBllAA8EcMtL0OlhrktaAMoQL/ccwJ0j9Gs9cFc Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org There's a test for null rq pointer inside the while loop in rbd_rq_fn() that's not needed. That same test already occurred in the immediatly preceding loop condition test. Signed-off-by: Alex Elder Reviewed-by: Yehuda Sadeh --- drivers/block/rbd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index bb8dad7..fad4ecb 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1462,10 +1462,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 */