From patchwork Sun Oct 18 10:00:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shraddha Barke X-Patchwork-Id: 7429731 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 30AFBBEEA4 for ; Sun, 18 Oct 2015 10:00:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4055420707 for ; Sun, 18 Oct 2015 10:00:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D16E20703 for ; Sun, 18 Oct 2015 10:00:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbbJRKAQ (ORCPT ); Sun, 18 Oct 2015 06:00:16 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:38864 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750749AbbJRKAP (ORCPT ); Sun, 18 Oct 2015 06:00:15 -0400 Received: by wicll6 with SMTP id ll6so61934348wic.1 for ; Sun, 18 Oct 2015 03:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=RhBBs1Xl/jTbIVRZcfxwlKSLbpg6OVol3vHOx/JRZnY=; b=gRpgOFeMkYXp9CJxRNMbFXu0QMoV9icEXdIw2XbY1S63PSJXousxALa7M0O+EASGiq 9wldr5XB95jmJEKkcM+bk6YpkjpFtdK932vgAY6ZsIQD3kmip+Hl3yNgvM8B5TATiXl+ HujYm1eQE44KjCNfgs2nnBADKQUnDLqoiKJxn7xn+g2H9ULYQqbjtzL4VhIAVbDX8uRy OVb8c9Dxu3mExxyezmdjlR1voUoJSxZQpIgZbW+9XvFksRmFQ9+X5sbYzQtkU69TfMJa nVfN/OPPHkl97BbfrzLoZWTy0jKuB9h4avRGG0xMKvZ/MPCNqqtgMtep5e2K07iPUWrI fW5Q== X-Received: by 10.194.222.227 with SMTP id qp3mr31135190wjc.36.1445162413872; Sun, 18 Oct 2015 03:00:13 -0700 (PDT) Received: from shraddha-370R4E-370R4V-370R5E-3570RE-370R5V.bits-goa.ac.in ([122.15.200.115]) by smtp.gmail.com with ESMTPSA id ki7sm33206010wjc.28.2015.10.18.03.00.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 03:00:13 -0700 (PDT) From: Shraddha Barke To: Cc: Subject: [PATCH] Net: ceph: messenger: Use local variable cursor in read_partial_msg_data() Date: Sun, 18 Oct 2015 15:30:03 +0530 Message-Id: <1445162403-7612-1-git-send-email-shraddha.6596@gmail.com> X-Mailer: git-send-email 2.1.4 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_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 Use local variable cursor in place of &msg->cursor in read_partial_msg_data() Signed-off-by: Shraddha Barke --- net/ceph/messenger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index b9b0e3b..b3d1973 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2231,7 +2231,7 @@ static int read_partial_message_section(struct ceph_connection *con, static int read_partial_msg_data(struct ceph_connection *con) { struct ceph_msg *msg = con->in_msg; - struct ceph_msg_data_cursor *cursor = &msg->cursor; + struct ceph_msg_data_cursor *cursor = cursor; const bool do_datacrc = !con->msgr->nocrc; struct page *page; size_t page_offset; @@ -2246,7 +2246,7 @@ static int read_partial_msg_data(struct ceph_connection *con) if (do_datacrc) crc = con->in_data_crc; while (cursor->resid) { - page = ceph_msg_data_next(&msg->cursor, &page_offset, &length, + page = ceph_msg_data_next(cursor, &page_offset, &length, NULL); ret = ceph_tcp_recvpage(con->sock, page, page_offset, length); if (ret <= 0) { @@ -2258,7 +2258,7 @@ static int read_partial_msg_data(struct ceph_connection *con) if (do_datacrc) crc = ceph_crc32c_page(crc, page, page_offset, ret); - (void) ceph_msg_data_advance(&msg->cursor, (size_t)ret); + (void) ceph_msg_data_advance(cursor, (size_t)ret); } if (do_datacrc) con->in_data_crc = crc;