From patchwork Tue May 23 14:54:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 9742921 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F0B16032C for ; Tue, 23 May 2017 14:54:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AA83286F2 for ; Tue, 23 May 2017 14:54:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FCD3286FC; Tue, 23 May 2017 14:54:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1010286F2 for ; Tue, 23 May 2017 14:54:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968311AbdEWOyf (ORCPT ); Tue, 23 May 2017 10:54:35 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:33279 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968302AbdEWOye (ORCPT ); Tue, 23 May 2017 10:54:34 -0400 Received: by mail-it0-f67.google.com with SMTP id l145so17378616ita.0; Tue, 23 May 2017 07:54:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=rF8saLFcGm0BywDSc+svLMohUpkQYqE6KxlZQd5F5W8=; b=GDnpE8PtuQ42LW/+0FSObLHCVJz4W5QzQbFGhlERf/a/XUea93DHHdorjhEMkmSmLh ZdFgiBD3OQmGXl445FFKPupTYH9zUOnSMLpytpfEkQKbEnhvslI6FA5tfkpzew5wua5n ZE3G/zjzM87Rsj1C11vPvDvwrzSDg0dFLw+IzaWmdksOBPSFFOi/qoT7arzNAFDA2yNZ UNBzxofOC8R5mIxmItYXmu3s8jFsPDZDzSpZA9j+j7xtSzR7+ZwIjOY1nMpQ+MIrP/B0 cDZNuSnm379udsOXM6RXQCJlXT/4P7e50zlt8I3dYWg4tkS3hySafDz15nkmo8SY84yW 2eSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=rF8saLFcGm0BywDSc+svLMohUpkQYqE6KxlZQd5F5W8=; b=FiLIJeJBcPWQI+XA2OsZiY6gcWpXFjtxtYnYMlpp+g5OE++LmoXu7Ot9gWXz5HamQw BJqETANw1FdjGy+++vi2uTeLzKoZYIGt+SLALFW7fueYlDJb1f/raTVS2uKB/6spSlNh 9foNYSN5TL4lDMVhRIX6fKSyFEWptBXiV2GpSn0+QMCEpSs5QsnFU2cdkq/gWw+6M75u 0X6ncVnXry5Qc+CNJuwt5JBfbvd+do0wcFDMHKHnXAX6oQI51xjtqRB/C33xCfzhawtV Cddhitbay6nR0BuBRtNKp1nQKwZAyyIdE1+/46/Z67BykHdTFQz9E+//oqZj98B8e8Z1 iOUQ== X-Gm-Message-State: AODbwcCIqGDgRPVW2x0dqtYE0izdLDmfxXWd9IMElts5gAR3iWhmD7my NDVvFUCt9Apu7E35 X-Received: by 10.36.117.211 with SMTP id y202mr3384287itc.88.1495551267876; Tue, 23 May 2017 07:54:27 -0700 (PDT) Received: from manet.1015granger.net (c-68-46-169-226.hsd1.mi.comcast.net. [68.46.169.226]) by smtp.gmail.com with ESMTPSA id i73sm352117ioi.55.2017.05.23.07.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 07:54:27 -0700 (PDT) Subject: [PATCH v1 06/12] xprtrdma: Rename rpcrdma_req::rl_free From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Tue, 23 May 2017 10:54:27 -0400 Message-ID: <20170523145426.961.42537.stgit@manet.1015granger.net> In-Reply-To: <20170523142629.961.81233.stgit@manet.1015granger.net> References: <20170523142629.961.81233.stgit@manet.1015granger.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up: I'm about to use the rl_free field for purposes other than a free list. So use a more generic name. This is a refactoring change only. BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305 Fixes: 68791649a725 ('xprtrdma: Invalidate in the RPC reply ... ') Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/verbs.c | 9 ++++----- net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index a8be66d..df72224 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -971,7 +971,6 @@ struct rpcrdma_req * if (req == NULL) return ERR_PTR(-ENOMEM); - INIT_LIST_HEAD(&req->rl_free); spin_lock(&buffer->rb_reqslock); list_add(&req->rl_all, &buffer->rb_allreqs); spin_unlock(&buffer->rb_reqslock); @@ -1055,7 +1054,7 @@ struct rpcrdma_rep * goto out; } req->rl_backchannel = false; - list_add(&req->rl_free, &buf->rb_send_bufs); + list_add(&req->rl_list, &buf->rb_send_bufs); } INIT_LIST_HEAD(&buf->rb_recv_bufs); @@ -1084,8 +1083,8 @@ struct rpcrdma_rep * struct rpcrdma_req *req; req = list_first_entry(&buf->rb_send_bufs, - struct rpcrdma_req, rl_free); - list_del(&req->rl_free); + struct rpcrdma_req, rl_list); + list_del(&req->rl_list); return req; } @@ -1268,7 +1267,7 @@ struct rpcrdma_req * spin_lock(&buffers->rb_lock); buffers->rb_send_count--; - list_add_tail(&req->rl_free, &buffers->rb_send_bufs); + list_add_tail(&req->rl_list, &buffers->rb_send_bufs); if (rep) { buffers->rb_recv_count--; list_add_tail(&rep->rr_list, &buffers->rb_recv_bufs); diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h index 1c23117..ad918c8 100644 --- a/net/sunrpc/xprtrdma/xprt_rdma.h +++ b/net/sunrpc/xprtrdma/xprt_rdma.h @@ -340,7 +340,7 @@ enum { struct rpcrdma_buffer; struct rpcrdma_req { - struct list_head rl_free; + struct list_head rl_list; unsigned int rl_mapped_sges; unsigned int rl_connect_cookie; struct rpcrdma_buffer *rl_buffer;