From patchwork Mon Sep 10 15:10:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever III X-Patchwork-Id: 10594421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7460214BD for ; Mon, 10 Sep 2018 15:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6747429291 for ; Mon, 10 Sep 2018 15:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65B83292B4; Mon, 10 Sep 2018 15:10:50 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,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 84EDA29291 for ; Mon, 10 Sep 2018 15:10:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727772AbeIJUFU (ORCPT ); Mon, 10 Sep 2018 16:05:20 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:54306 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727940AbeIJUFU (ORCPT ); Mon, 10 Sep 2018 16:05:20 -0400 Received: by mail-it0-f66.google.com with SMTP id f14-v6so29943110ita.4; Mon, 10 Sep 2018 08:10:48 -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=82jf/QD3OycYtk46MOVuzP8B0TVMz+0IPis1ElHXaj8=; b=K5+PD3XptUShHE8OQmxpghY/QkHVS07lheqLv7xwmLB87BLapgGcGXbqprtwaEsdej 8htrhAJvMi/01YxtsKO7wSG0V1YSXZ2B2oSY1sTCC8mVg02I7kLKURPLgDGpPIWVn7ih CJdFnrGofMzRAKhIQ8ssncaYv7N4w8o/bU1/zJmjq/cAF096kssJ3zNW7axWAhEcY41q sG1pMcR2bFKdKWZGmUa6NEgBsMkFloJ62E7mynSTy9nwqBSKSlTub7KmjwTRjXFWcEnH v/K0ncx6tPPqHivqqrxJq7UnjFrUu9N6FZkQgnBKBjAKnq9eiKaJmXr8juWYruFaCoiy /sDA== 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=82jf/QD3OycYtk46MOVuzP8B0TVMz+0IPis1ElHXaj8=; b=jjfGidKIqRwjs8aaNcS3I/3DoRAynK248LrJQ72eo53sY5Q/kjrhRCqAsfeRqv9nG0 iHiBzO/G29pWEXULo+DBx37fDTlca+4+v9X6R4/MrWYRwn5gXogmhFHwAT3vIoEwCMuI j5bT6ATu9dU3shpSP/u2V9V0O5HSfBQsDi7Dr0u620FfkNbbmAfDwNAZNPbjUE2Bbq/V 7bmEShdiZwdRp0QGDj/buv+0tCQOSfz77wtjIbgWs71UGDwlZGc2Q/tkEfp6Z/VOR4a9 jTRNMML6KpYrLNcVDuKuQI3GbdyRvTJ6e8oPbLtgtKYODSAZg+6or0gkNwWGcIvAS9ZB yVBA== X-Gm-Message-State: APzg51AeypZk/jwiEfG/Eb0fGHhTxafj4DoeHsbIMXNDH9bZfIkjIhfT V6jB36RCcZYqzC5AkuXnWkK4UMJ6 X-Google-Smtp-Source: ANB0VdbfS28Goa8AkCNjg3lolPWSeFr9GWSWUbjjCZbIP9hFkx6t00+vfUf+g60X7WiCHesaHwIX3Q== X-Received: by 2002:a02:4a0a:: with SMTP id k10-v6mr17887453jab.134.1536592247945; Mon, 10 Sep 2018 08:10:47 -0700 (PDT) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id o201-v6sm7344387ito.41.2018.09.10.08.10.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 08:10:47 -0700 (PDT) Received: from manet.1015granger.net (manet.1015granger.net [192.168.1.51]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id w8AFAk9l015219; Mon, 10 Sep 2018 15:10:46 GMT Subject: [PATCH v1 21/22] xprtrdma: Clean up xprt_rdma_disconnect_inject From: Chuck Lever To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Date: Mon, 10 Sep 2018 11:10:46 -0400 Message-ID: <20180910151046.10564.27607.stgit@manet.1015granger.net> In-Reply-To: <20180910150040.10564.97487.stgit@manet.1015granger.net> References: <20180910150040.10564.97487.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: Use the appropriate C macro instead of open-coding container_of() . Signed-off-by: Chuck Lever --- net/sunrpc/xprtrdma/transport.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c index 67eb900..afc8fad 100644 --- a/net/sunrpc/xprtrdma/transport.c +++ b/net/sunrpc/xprtrdma/transport.c @@ -266,8 +266,7 @@ static void xprt_rdma_inject_disconnect(struct rpc_xprt *xprt) { - struct rpcrdma_xprt *r_xprt = container_of(xprt, struct rpcrdma_xprt, - rx_xprt); + struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt); trace_xprtrdma_inject_dsc(r_xprt); rdma_disconnect(r_xprt->rx_ia.ri_id);