From patchwork Wed Jun 26 19:45:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2788011 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CF64FC0AB1 for ; Wed, 26 Jun 2013 19:45:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA8A320423 for ; Wed, 26 Jun 2013 19:45:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 02DC720426 for ; Wed, 26 Jun 2013 19:45:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752616Ab3FZTpn (ORCPT ); Wed, 26 Jun 2013 15:45:43 -0400 Received: from mail-oa0-f44.google.com ([209.85.219.44]:35090 "EHLO mail-oa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752349Ab3FZTpn (ORCPT ); Wed, 26 Jun 2013 15:45:43 -0400 Received: by mail-oa0-f44.google.com with SMTP id l10so15494397oag.3 for ; Wed, 26 Jun 2013 12:45:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=7/U3XDYtohOCCYSj8U3aCcTpc6GbjaJYER0OqVG3H/s=; b=f9J6auXok+vXMQi+9f7vpR0DfruAKRRJIHR5eTTsVcSGocDc0nHzD7IdbxOOd5hsVq 2Zft3ckxv4CNTGCOm5ZGuqiE0/JxzbvCZHCPEVBEbIjuo19N3jF2aZPSVnF81rBt9qnH RYe1qt4CZwy7KPTjKkyrGFLbIHxCwcvbpGP/0fq8f9NJRMspPzNlcofei/rDuJhDhkHM zDGxbAO3kPDiRt73rcrSZmBrlnwCQ0+hLBv3Nkc0abP0bbZGZVN1yWKoKoBcKKVDaOYC aWboJF4HZTTH9u1Mp6zwP1qgCrH97m0CYUXbzsyNAPdva6NrXyjmPw5YZlPmrIcNBEuk Fe9A== X-Received: by 10.60.80.165 with SMTP id s5mr1233766oex.55.1372275942276; Wed, 26 Jun 2013 12:45:42 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-107-015-124-230.nc.res.rr.com. [107.15.124.230]) by mx.google.com with ESMTPSA id m11sm8575652oer.4.2013.06.26.12.45.41 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 26 Jun 2013 12:45:41 -0700 (PDT) From: Jeff Layton To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, chuck.lever@oracle.com Subject: [PATCH v2 1/3] nfs: refactor "need_mount" code out of nfs_try_mount Date: Wed, 26 Jun 2013 15:45:34 -0400 Message-Id: <1372275936-5360-2-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372275936-5360-1-git-send-email-jlayton@redhat.com> References: <1372275936-5360-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQlsrf76e1PAhs4Tt8PQ4Cqveskn+u80Cip6vi/EUg8Ek1+H4ijkQUrIYeenmUPYUWXvUQmk 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, RCVD_IN_DNSWL_HI, 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 This looks like pointless refactoring for now, but we'll flesh out the need_mount case a little more in a later patch. Cc: Chuck Lever Signed-off-by: Jeff Layton --- fs/nfs/super.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 2d7525f..afeee81 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1759,21 +1759,29 @@ static int nfs_request_mount(struct nfs_parsed_mount_data *args, return nfs_select_flavor(args, &request); } +static struct nfs_server *nfs_try_mount_request(struct nfs_mount_info *mount_info, + struct nfs_subversion *nfs_mod) +{ + int status; + + status = nfs_request_mount(mount_info->parsed, mount_info->mntfh); + if (status) + return ERR_PTR(status); + + return nfs_mod->rpc_ops->create_server(mount_info, nfs_mod); +} + struct dentry *nfs_try_mount(int flags, const char *dev_name, struct nfs_mount_info *mount_info, struct nfs_subversion *nfs_mod) { - int status; struct nfs_server *server; - if (mount_info->parsed->need_mount) { - status = nfs_request_mount(mount_info->parsed, mount_info->mntfh); - if (status) - return ERR_PTR(status); - } + if (mount_info->parsed->need_mount) + server = nfs_try_mount_request(mount_info, nfs_mod); + else + server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod); - /* Get a volume representation */ - server = nfs_mod->rpc_ops->create_server(mount_info, nfs_mod); if (IS_ERR(server)) return ERR_CAST(server);