From patchwork Fri Apr 22 00:51:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 8905061 Return-Path: X-Original-To: patchwork-linux-nfs@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 849DBBF29F for ; Fri, 22 Apr 2016 00:52:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF3F020270 for ; Fri, 22 Apr 2016 00:52:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E9C32021F for ; Fri, 22 Apr 2016 00:52:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751594AbcDVAwO (ORCPT ); Thu, 21 Apr 2016 20:52:14 -0400 Received: from mail-qk0-f180.google.com ([209.85.220.180]:36602 "EHLO mail-qk0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbcDVAwN (ORCPT ); Thu, 21 Apr 2016 20:52:13 -0400 Received: by mail-qk0-f180.google.com with SMTP id x7so33030704qkd.3 for ; Thu, 21 Apr 2016 17:52:13 -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=TFYcPVZGt5M8etpb1vi6nPet/Uv9wbv4NlVFm71X/AI=; b=LFXCgpQCrHpJ3c6EAGw+mUUHEaIWjwNB+f7IwXcw5apL+JRrtAuztFdM/0jfaLdS8O N1ief3AmQ67ga4ZJgncRgCHTm9nF/N0hjsZkMAcSWQyEDRwZbQ2xgqdOIapokT68MCk8 XmwmwIggv64IKJx/2G6DfXs4/XbHfPs3G7MC761ofonT2hFNMWfTCJQoFXHtW3C6V1fU mo23osCOjKZjXxfPzDCHBwhywL7l0hhdqYGaV7anvvLJV1nuNlXSXFpPdF7z5KXsjS8T AuvsM+vbX3ZDOS1TeBlTssKWTqAOb4C3rKVHFSZVoU+hjSnZIX5KoeZr5r1Pzd6KLMcp sTwA== 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=TFYcPVZGt5M8etpb1vi6nPet/Uv9wbv4NlVFm71X/AI=; b=OgzdEuLoneXZQzW1+g9Fwef4NT0Dts4urkEIwOP3CUeOFLScT2xX/0EHtxlIzhl+Lr n5Cf4fuxXcM/Xv+HAk+1nwer9yDTxi4XdQzLu4J+cFRHlHzlB5sL5ZWE44kkyxT3w4tP 2OyqBet5ZdmJ0C+82P5ZXvRjGYvA8pDUbZBQA+abGzDMDG2C7D5DIZoZfW7ikJfQzuhC A4dzWZJlTq68lFapErdQoMVvCk94XMvEZjbaH0hhzKhN47OnD0dzp6vjDxWEHk0/xd/Y PHJP/5IYErA7FnFGvQttNDtqLbzSu1Gl7cuQllLWdnF608aPdhOxb4QtatrN0xeGBdV+ sNGw== X-Gm-Message-State: AOPr4FUpc2V+pkm9wPwkmj10HrnJJU4f9oU5q6vB1Y+qDf1kuntsy3noQuWvBx/pvIZBew== X-Received: by 10.55.23.13 with SMTP id i13mr2510611qkh.150.1461286332518; Thu, 21 Apr 2016 17:52:12 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id 13sm1573335qgt.8.2016.04.21.17.52.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Apr 2016 17:52:11 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: trond.myklebust@primarydata.com Cc: Anna Schumaker , linux-nfs@vger.kernel.org Subject: [PATCH v2 4/7] nfs: don't call nfs4_ff_layout_prepare_ds from ff_layout_get_ds_cred Date: Thu, 21 Apr 2016 20:51:57 -0400 Message-Id: <1461286320-24601-5-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1461286320-24601-1-git-send-email-jeff.layton@primarydata.com> References: <1461286320-24601-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=-7.8 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 All the callers already call that function before calling into here, so it ends up being a no-op anyway. Signed-off-by: Jeff Layton --- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index add0e5a70bd6..a0dbf94d15ae 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -433,16 +433,12 @@ ff_layout_get_ds_cred(struct pnfs_layout_segment *lseg, u32 ds_idx, struct rpc_cred *mdscred) { struct nfs4_ff_layout_mirror *mirror = FF_LAYOUT_COMP(lseg, ds_idx); - struct rpc_cred *cred = ERR_PTR(-EINVAL); - - if (!nfs4_ff_layout_prepare_ds(lseg, ds_idx, true)) - goto out; + struct rpc_cred *cred; if (mirror && mirror->cred) cred = mirror->cred; else cred = mdscred; -out: return cred; }