From patchwork Mon Jul 23 10:05:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Idan Kedar X-Patchwork-Id: 1227211 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 475563FCFC for ; Mon, 23 Jul 2012 10:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751879Ab2GWKFX (ORCPT ); Mon, 23 Jul 2012 06:05:23 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:48904 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751743Ab2GWKFX (ORCPT ); Mon, 23 Jul 2012 06:05:23 -0400 Received: by mail-lb0-f174.google.com with SMTP id gm6so7792703lbb.19 for ; Mon, 23 Jul 2012 03:05:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=6Dl7+x4zsl777q387n+pVE/V7yS+B49o6IKr50xSRsA=; b=Z6Oiy1PoC9rVi9+5vTHY2rBurExNjYUQseRyz9EJHy7FlRU2m2O7VrZx1M7DacJDqw K7Ugr3NpfAW7XZ4vAZpZCHQK4oBGkMxG4yu227dXTQ3Qb7V5mb0Sj3TsBB2X45x3PtbC BCvNFH2OAYuvxBKW0lrZOMJrtnJnAF4T5mfWDapTaWRbH+BDUK8hw/G5uGdVbpnZG+22 y85PTKqE6YlwHuxj5Z5oNSbPm7ml/BmH10G48yiinknw/evSPHj01uShXX8rh+3WuaTY ze87cDtaEAYbS3bXVikvFg+I6qkG+hho91Mn10ay6fj58nvndlLMq6tD848VOuR1EAfT qXEQ== Received: by 10.152.135.200 with SMTP id pu8mr16018851lab.8.1343037922083; Mon, 23 Jul 2012 03:05:22 -0700 (PDT) Received: from tonian.com (bzq-79-177-240-7.red.bezeqint.net. [79.177.240.7]) by mx.google.com with ESMTPS id jj5sm12999633lab.1.2012.07.23.03.05.19 (version=SSLv3 cipher=OTHER); Mon, 23 Jul 2012 03:05:21 -0700 (PDT) From: Idan Kedar To: Trond Myklebust , linux-nfs@vger.kernel.org Cc: Benny Halevy Subject: [PATCH 2/3] pnfs: nfs4_proc_layoutget returns void Date: Mon, 23 Jul 2012 13:05:06 +0300 Message-Id: <1343037907-26457-3-git-send-email-idank@tonian.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1343037907-26457-1-git-send-email-idank@tonian.com> References: <1343037907-26457-1-git-send-email-idank@tonian.com> X-Gm-Message-State: ALoCoQnUGvQt8quO9FZ/IPo+Iwj7onnFNwb3k0+hZ0u1tQJX7+CjLrM+YoemIyM1bVokqogf2QNK Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org since the only user of nfs4_proc_layoutget is send_layoutget, which ignores its return value, there is no reason to return any value. Signed-off-by: Idan Kedar Signed-off-by: Benny Halevy --- fs/nfs/nfs4proc.c | 8 ++++---- fs/nfs/pnfs.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 31a7858..3db9ce7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -6227,7 +6227,7 @@ static const struct rpc_call_ops nfs4_layoutget_call_ops = { .rpc_release = nfs4_layoutget_release, }; -int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) +void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) { struct nfs_server *server = NFS_SERVER(lgp->args.inode); u32 max_pages = max_response_pages(server); @@ -6251,7 +6251,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) lgp->args.layout.pages = alloc_pagevec(max_pages, gfp_flags); if (!lgp->args.layout.pages) { nfs4_layoutget_release(lgp); - return -ENOMEM; + return; } lgp->args.layout.pglen = max_pages * PAGE_SIZE; @@ -6260,7 +6260,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) nfs41_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0); task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) - return PTR_ERR(task); + return; status = nfs4_wait_for_completion_rpc_task(task); if (status == 0) status = task->tk_status; @@ -6268,7 +6268,7 @@ int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) status = pnfs_layout_process(lgp); rpc_put_task(task); dprintk("<-- %s status=%d\n", __func__, status); - return status; + return; } static void diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 9a31ff3..eda42b9 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -171,7 +171,7 @@ extern int nfs4_proc_getdevicelist(struct nfs_server *server, struct pnfs_devicelist *devlist); extern int nfs4_proc_getdeviceinfo(struct nfs_server *server, struct pnfs_device *dev); -extern int nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags); +extern void nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags); extern int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp); /* pnfs.c */