From patchwork Fri Jul 25 11:34:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4622511 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 7C837C0338 for ; Fri, 25 Jul 2014 11:35:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 875AA201ED for ; Fri, 25 Jul 2014 11:35:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A922E201F2 for ; Fri, 25 Jul 2014 11:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760233AbaGYLev (ORCPT ); Fri, 25 Jul 2014 07:34:51 -0400 Received: from mail-qa0-f46.google.com ([209.85.216.46]:37107 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751856AbaGYLeu (ORCPT ); Fri, 25 Jul 2014 07:34:50 -0400 Received: by mail-qa0-f46.google.com with SMTP id v10so4392299qac.19 for ; Fri, 25 Jul 2014 04:34:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MK3e8zyNlxzHnZLnl6pyKQQGsDjzFbCzOHi447+mC8I=; b=Xyk/XqlHoGmn+oCwYDDjww8QaDuPfO5M37VeY+viPy8/7AXe2q1WDlZRWHMWLAM1kI ubLwH0tMMo0Dfx+mE1vKDrbuHJEQK3viEK8XqIaerIapYurwkaIU6VkCuwiOEhUxpP4w z72vMDkmnWGM6XOuQdkyNFpzKKBTlgrqCSYxyYAiW7LBuGgTb07pI9XAhbbmvYXZU37C RHpQksHm4cHOskQ0FQ2SvMUvHhmAeUbnek5z5X+LsX71Agv32I7NKaaZLujOXZEsc4Vb 52glRJkJHJM6+WjOBwFf4GfvJOBKfZb5JZPlfmGHFclbcmuGwKGMPhWtIzp0/uvN6WyQ WK3A== X-Gm-Message-State: ALoCoQlRqzgOCBTnl3JF8dss6nPsA97RmOHd0x5/py0yvoNKp1bCAVp1z0FsJlBA2MWzi4eqUYVd X-Received: by 10.224.80.129 with SMTP id t1mr26400558qak.102.1406288089664; Fri, 25 Jul 2014 04:34:49 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id p12sm11041561qga.0.2014.07.25.04.34.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 04:34:48 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v6 6/9] nfsd: clean up arguments to nfs4_open_delegation Date: Fri, 25 Jul 2014 07:34:24 -0400 Message-Id: <1406288067-20663-7-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406288067-20663-1-git-send-email-jlayton@primarydata.com> References: <1406288067-20663-1-git-send-email-jlayton@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=-6.9 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 No need to pass in a net pointer since we can derive that. Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/nfs4state.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 049ef2ce72bf..24065e1b2bb2 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -3607,11 +3607,12 @@ static void nfsd4_open_deleg_none_ext(struct nfsd4_open *open, int status) * proper support for them. */ static void -nfs4_open_delegation(struct net *net, struct svc_fh *fh, - struct nfsd4_open *open, struct nfs4_ol_stateid *stp) +nfs4_open_delegation(struct svc_fh *fh, struct nfsd4_open *open, + struct nfs4_ol_stateid *stp) { struct nfs4_delegation *dp; - struct nfs4_openowner *oo = container_of(stp->st_stateowner, struct nfs4_openowner, oo_owner); + struct nfs4_openowner *oo = openowner(stp->st_stateowner); + struct nfs4_client *clp = stp->st_stid.sc_client; int cb_up; int status = 0; @@ -3630,7 +3631,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, * Let's not give out any delegations till everyone's * had the chance to reclaim theirs.... */ - if (locks_in_grace(net)) + if (locks_in_grace(clp->net)) goto out_no_deleg; if (!cb_up || !(oo->oo_flags & NFS4_OO_CONFIRMED)) goto out_no_deleg; @@ -3649,7 +3650,7 @@ nfs4_open_delegation(struct net *net, struct svc_fh *fh, default: goto out_no_deleg; } - dp = alloc_init_deleg(oo->oo_owner.so_client, fh); + dp = alloc_init_deleg(clp, fh); if (dp == NULL) goto out_no_deleg; status = nfs4_set_delegation(dp, stp->st_file); @@ -3762,7 +3763,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf * Attempt to hand out a delegation. No error return, because the * OPEN succeeds even if we fail. */ - nfs4_open_delegation(SVC_NET(rqstp), current_fh, open, stp); + nfs4_open_delegation(current_fh, open, stp); nodeleg: status = nfs_ok;