From patchwork Mon Jan 13 10:58:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3474491 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7FA8A9F2E9 for ; Mon, 13 Jan 2014 10:59:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A40A620107 for ; Mon, 13 Jan 2014 10:59:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0315200FE for ; Mon, 13 Jan 2014 10:59:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751172AbaAMK7m (ORCPT ); Mon, 13 Jan 2014 05:59:42 -0500 Received: from mail-ee0-f43.google.com ([74.125.83.43]:58759 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751351AbaAMK7l (ORCPT ); Mon, 13 Jan 2014 05:59:41 -0500 Received: by mail-ee0-f43.google.com with SMTP id c41so483181eek.30 for ; Mon, 13 Jan 2014 02:59:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HX9dcJYIPRcLznFrm0O7Z6noD4KulPKk406c/NY1SRs=; b=bnNEJAl3JpOb2OETDXmfl2Q8OC4yyZOAorPKumfMqljuY4ZTK8f9q/vHFoKtD7aDnF szOBLWYPNfbI4w55z/P1u1tHYLUHDQnB++xsbLozyDin8qcLS4mSO6eFcjC2AeGDogpD Zla9XsCYXvtuFOgetPPo2OimDHoXLVvGuomoxl1napJGdfJINVrlfEAhRJ3Zqhpd/WZm Buj/RksUmksNo1MsVU0ElJj5SX5W3oK41PCqrrGiALYNh9Zv8bxViKzj2CxhoqHHsnto v82xUhkU2trpA8lIaalhAA639j7TY4YwbAziZVID7KZGc8WfD2Eq69Wc2XsKRKnT1ELd Hd/g== X-Gm-Message-State: ALoCoQkN62b5JDoOHLo7sK7rRn/9//fwUaBnYbHC1TzwS0zBxfSj4GHVWUI8fpvCQBMaPdM0hrKi X-Received: by 10.15.49.193 with SMTP id j41mr26697435eew.10.1389610780064; Mon, 13 Jan 2014 02:59:40 -0800 (PST) Received: from localhost ([109.110.66.199]) by mx.google.com with ESMTPSA id x45sm11492913eee.3.2014.01.13.02.59.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 02:59:39 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: ilya.dryomov@inktank.com Subject: [PATCH 2/3] libceph: rename front to front_len in get_reply() Date: Mon, 13 Jan 2014 12:58:40 +0200 Message-Id: <1389610721-5280-3-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389610721-5280-1-git-send-email-ilya.dryomov@inktank.com> References: <1389610721-5280-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename front local variable to front_len in get_reply() to make its purpose more clear. Signed-off-by: Ilya Dryomov --- net/ceph/osd_client.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 7ae5ebd43b4d..bf1b418cc06d 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -2513,7 +2513,7 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, struct ceph_osd_client *osdc = osd->o_osdc; struct ceph_msg *m; struct ceph_osd_request *req; - int front = le32_to_cpu(hdr->front_len); + int front_len = le32_to_cpu(hdr->front_len); int data_len = le32_to_cpu(hdr->data_len); u64 tid; @@ -2532,12 +2532,13 @@ static struct ceph_msg *get_reply(struct ceph_connection *con, goto out; } - if (front > req->r_reply->front.iov_len) { + if (front_len > req->r_reply->front.iov_len) { pr_warning("get_reply front %d > preallocated %d (%u#%llu)\n", - front, (int)req->r_reply->front.iov_len, + front_len, (int)req->r_reply->front.iov_len, (unsigned int)con->peer_name.type, le64_to_cpu(con->peer_name.num)); - m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front, GFP_NOFS, false); + m = ceph_msg_new(CEPH_MSG_OSD_OPREPLY, front_len, GFP_NOFS, + false); if (!m) goto out; ceph_msg_put(req->r_reply);