From patchwork Fri May 4 20:22:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 10381647 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 8748660353 for ; Fri, 4 May 2018 20:23:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75F242936E for ; Fri, 4 May 2018 20:23:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AF1F295B5; Fri, 4 May 2018 20:23:46 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 DBCDF295B1 for ; Fri, 4 May 2018 20:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751759AbeEDUXp (ORCPT ); Fri, 4 May 2018 16:23:45 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:35339 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748AbeEDUXo (ORCPT ); Fri, 4 May 2018 16:23:44 -0400 Received: by mail-qt0-f194.google.com with SMTP id f5-v6so15698862qth.2 for ; Fri, 04 May 2018 13:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=8h0IitUNtRnIg/BMJHzKcM/eRJ+t25CjgyeD+BYKpqg=; b=HQl7yKsVw2UE/BQ+NjrDJ130PUOXUfhjNmdU6rDDAl6OBBxGmKCDTEsK5gJGvRzEek T40ww5R8sefR43uMPfbi9pCSfM6SLZlWhf8argUHSuOcYbgQqJu6p8gpDlbGfIpYSfnQ OhH02kjIs1NeKewS7R0KPfIOL2FDHROBkkW0OnzYzqdpPWn/hp39k7seIwi+LHGgFUJW 70f3YYh6SLfrLmcdBjnKc6ohrZFkSTUwXz40+y/+Idmui+I5DgRfENDI5M3EBhiXKpgB usK3AEVg7dW91WzSos0dhbDs6MYycL74Qabzdgf2nE/3iP33W5n9NI9qgYydV2Fe3lo6 KO9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=8h0IitUNtRnIg/BMJHzKcM/eRJ+t25CjgyeD+BYKpqg=; b=SNpl9n/pJL+eEscVta7mVSha48WX+jh5iHDXxchTkYzuy0YfjzDAldQtJZZD+2ARbJ uujlLgJzv1VlFlrAsTKqeOj2+7CBtirF4wIF1PkLH2xODbqKb77PXFD0R432E0XzLwoQ 7IBFc7OYXl+5Vz03RGKyqy4mOfixMOyUeMzjOP2nwzuljpaBQhstn4eAIYPNOBXuZarj NSxbAWplGMPSm78JLCPydyg8d5YKr5gTGoILrUqRKxxYEbaM2AERBBK0/6bjgXXf0uCi xdlqVYiznRKSySBzSZk8BnA/dF/4+50c8VGkfzaD9rVVIqXU6Yk4MUfca4YpSUSier1L MuTQ== X-Gm-Message-State: ALKqPweTk8rOpqU5s7BxVdjuP2GBh5nX0PMYl7KpXZxb0FYSRSP2SixN 0NNoPzh9GSFZ3iGUH801s0sPazD6 X-Google-Smtp-Source: AB8JxZp5XRJ+htsd+SevRmdoUXd23R9jLgo5xE0YT2jmGAFkug+ZEiPojC+lWM90Z9mXGuSyLHnErw== X-Received: by 2002:a0c:9a43:: with SMTP id q3-v6mr9089759qvd.221.1525465423480; Fri, 04 May 2018 13:23:43 -0700 (PDT) Received: from gouda.nowheycreamery.com.com (c-68-40-188-1.hsd1.mi.comcast.net. [68.40.188.1]) by smtp.gmail.com with ESMTPSA id m25-v6sm7359261qtb.42.2018.05.04.13.23.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 13:23:42 -0700 (PDT) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: Trond.Myklebust@primarydata.com, linux-nfs@vger.kernel.org Subject: [PATCH 5/5] NFS: Combine nfs4_call_sync() with nfs4_call_sync_sequence() Date: Fri, 4 May 2018 16:22:52 -0400 Message-Id: <20180504202252.5862-6-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504202252.5862-1-Anna.Schumaker@Netapp.com> References: <20180504202252.5862-1-Anna.Schumaker@Netapp.com> 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 From: Anna Schumaker The nfs4_call_sync_sequence() version only hase a single user, nfs4_call_sync(), so let's just add in a call to nfs4_init_sequence() instead of needing to have another function just to do this. Signed-off-by: Anna Schumaker --- fs/nfs/nfs4proc.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 505f605dcac2..99d77f6e7e40 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -993,11 +993,13 @@ static const struct rpc_call_ops nfs40_call_sync_ops = { .rpc_call_done = nfs40_call_sync_done, }; -static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, - struct nfs_server *server, - struct rpc_message *msg, - struct nfs4_sequence_args *args, - struct nfs4_sequence_res *res) +int nfs4_call_sync(struct rpc_clnt *clnt, + struct nfs_server *server, + struct rpc_message *msg, + struct nfs4_sequence_args *args, + struct nfs4_sequence_res *res, + int cache_reply, + int privileged) { int ret; struct rpc_task *task; @@ -1014,6 +1016,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, .callback_data = &data }; + nfs4_init_sequence(args, res, cache_reply, privileged); task = rpc_run_task(&task_setup); if (IS_ERR(task)) ret = PTR_ERR(task); @@ -1024,18 +1027,6 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, return ret; } -int nfs4_call_sync(struct rpc_clnt *clnt, - struct nfs_server *server, - struct rpc_message *msg, - struct nfs4_sequence_args *args, - struct nfs4_sequence_res *res, - int cache_reply, - int privileged) -{ - nfs4_init_sequence(args, res, cache_reply, privileged); - return nfs4_call_sync_sequence(clnt, server, msg, args, res); -} - static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo, unsigned long timestamp) {