From patchwork Wed May 11 10:21:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9067461 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 10E199F1C1 for ; Wed, 11 May 2016 10:21:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30E0C20114 for ; Wed, 11 May 2016 10:21:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FFA1201BB for ; Wed, 11 May 2016 10:21:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932192AbcEKKVb (ORCPT ); Wed, 11 May 2016 06:21:31 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:35150 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932134AbcEKKVa (ORCPT ); Wed, 11 May 2016 06:21:30 -0400 Received: by mail-qk0-f194.google.com with SMTP id n62so2438172qkc.2 for ; Wed, 11 May 2016 03:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oI6mGJubAve6EwC4tJmcOn8jPLD2AGYGlK8245+jpic=; b=WWRv8FUNRJVXplse5PG/MYM4ud/j5ZB5Y6vlKEL0vtTfpg4LsZUQviFRDQRfdGouDm qOcWH7Qgah4DmdJWVW4T4DI3xzdL/Fh1likezVR96ZbTxXKnAXzURM8r1fB6efT5hMbf QA9EAlgMyJzGj12rJ4Am5hZxvAbxJm/odkXSSyBBLpTJRMTRpWNt0dkNInecN1/Zvpg7 yTl+atMSZX4u4XFevTxVNFOdqxIQ6bfCTinx/+4Fr1ZxvBF1BjSi3mX2sSCj8vysbU0O IAEWqSmzpt1K2oT1kvYt1+AKCLZZsBjviZRwrj02DQvzRV5YNXR7NWQLCSVlk13eEPNl KjeA== 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=oI6mGJubAve6EwC4tJmcOn8jPLD2AGYGlK8245+jpic=; b=KUNCHPPS7Y7kdmMRXOHM+9Nx+cZSSX1MhLWm2b5D/IVLJPcC36ykLY0V1pInoMFY7t W1GQxneSS4+SFA+KlnTfWJD7ZYqE/mZB7oUhTe5Fl7AROatem8kS8mQjUWE4f+5tTdBK f8SkfDzxkZVctIppPkszoVmt3o0wtrT3rphZQp94lqZPZGuXSH1kK+IBUGBe9uRZuUrn Mj+KHn+rGMzZGRfMSpL5lGGzg/4DUIMNMU1OM3/14LLPpQAfCs6FqyvmYrFYQfg+Y1Y6 2WmjNXfDWBZBR2NfXDLCo9bQ3TX0avSUkWR6yrNsT1qbsSRJ2kCfpcaCqZZXXQchPkYA HH8A== X-Gm-Message-State: AOPr4FWSgBk07Ouo9nIRm03cs8dRZHYzglIwXNT/Oh8SsQ0lZwshKvuIQ5zRSR6HoATQ+w== X-Received: by 10.55.204.214 with SMTP id n83mr2535046qkl.154.1462962089016; Wed, 11 May 2016 03:21:29 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id r127sm3048446qkf.47.2016.05.11.03.21.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 May 2016 03:21:28 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 6/9] flexfiles: add kerneldoc header to nfs4_ff_layout_prepare_ds Date: Wed, 11 May 2016 06:21:11 -0400 Message-Id: <1462962074-6989-7-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462962074-6989-1-git-send-email-jeff.layton@primarydata.com> References: <1462962074-6989-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: Jeff Layton --- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index 5eff05e9eb4d..61094d59ee3a 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -342,7 +342,23 @@ out: return fh; } -/* Upon return, either ds is connected, or ds is NULL */ +/** + * nfs4_ff_layout_prepare_ds - prepare a DS connection for an RPC call + * @lseg: the layout segment we're operating on + * @ds_idx: index of the DS to use + * @fail_return: return layout on connect failure? + * + * Try to prepare a DS connection to accept an RPC call. This involves + * selecting a mirror to use and connecting the client to it if it's not + * already connected. + * + * Since we only need single functioning mirror to satisfy a read, we don't + * want to return the layout if there is one. For writes though, any down + * mirror should result in a LAYOUTRETURN. @fail_return is how we distinguish + * between the two cases. + * + * Returns a pointer to a connected DS object on success or NULL on failure. + */ struct nfs4_pnfs_ds * nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, bool fail_return)