From patchwork Fri Jul 25 11:34:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4622541 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 45D689F38C for ; Fri, 25 Jul 2014 11:35:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B288201ED for ; Fri, 25 Jul 2014 11:35:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85D94201D5 for ; Fri, 25 Jul 2014 11:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759947AbaGYLe5 (ORCPT ); Fri, 25 Jul 2014 07:34:57 -0400 Received: from mail-qg0-f48.google.com ([209.85.192.48]:58190 "EHLO mail-qg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760265AbaGYLey (ORCPT ); Fri, 25 Jul 2014 07:34:54 -0400 Received: by mail-qg0-f48.google.com with SMTP id i50so4864459qgf.35 for ; Fri, 25 Jul 2014 04:34:54 -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=ZgwWoPXQOKrLx56RZ2GBMnlTqK4dFzTWNRhr1F4tNd0=; b=OgIrWRZljpE2WUpzdf3DaURKgdue2Uju2yiWfbNtQsrZaFtNeiQEoh0Wp+1BAzaZlS QQ++7DT9YqWIw6zkELKe80DWvZ0gy6NaGDICNPJ1z0UWdHivSjWYps0K2EBf6AYyvT6T wYE5IdJZegVjUBUGg6qX3DB8C9CgHQovxKJToWmT1syIROgpMEoiq98r2pThNv6EsVxf WFYohPA8OcWDIGpev9Hiiqf4mDzYGMvdzdnQMvvgfbiQ4N6AvMrm5+rni4fc7R7d+EzC aUUlYLzSRP7QFaBtEbScL/wBgLMnfVZ7po12lnRogFQky48XByeIR3mJFKZnq8wMpE9j a5RA== X-Gm-Message-State: ALoCoQmtdYY5++73OfnsVUTNagyAhannumLpr1QJ8ofQeYw/iOMQTsdh3hdhAjuOhjunObYF1n6/ X-Received: by 10.140.39.164 with SMTP id v33mr10703321qgv.39.1406288093940; Fri, 25 Jul 2014 04:34:53 -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.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 04:34:53 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v6 9/9] nfsd: remove dl_fh field from struct nfs4_delegation Date: Fri, 25 Jul 2014 07:34:27 -0400 Message-Id: <1406288067-20663-10-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 Now that the nfs4_file has a filehandle in it, we no longer need to keep a per-delegation copy of it. Switch to using the one in the nfs4_file instead. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 2 +- fs/nfsd/nfs4state.c | 3 +-- fs/nfsd/state.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index c393d6ca3fce..e9813389687b 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -337,7 +337,7 @@ static void encode_cb_recall4args(struct xdr_stream *xdr, p = xdr_reserve_space(xdr, 4); *p++ = xdr_zero; /* truncate */ - encode_nfs_fh4(xdr, &dp->dl_fh); + encode_nfs_fh4(xdr, &dp->dl_file->fi_fhandle); hdr->nops++; } diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ecfddca9b841..b0f83beeca75 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -604,7 +604,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct svc_fh *current_fh) INIT_LIST_HEAD(&dp->dl_perclnt); INIT_LIST_HEAD(&dp->dl_recall_lru); dp->dl_type = NFS4_OPEN_DELEGATE_READ; - fh_copy_shallow(&dp->dl_fh, ¤t_fh->fh_handle); INIT_WORK(&dp->dl_recall.cb_work, nfsd4_run_cb_recall); return dp; out_dec: @@ -3097,7 +3096,7 @@ void nfsd4_prepare_cb_recall(struct nfs4_delegation *dp) struct nfs4_client *clp = dp->dl_stid.sc_client; struct nfsd_net *nn = net_generic(clp->net, nfsd_net_id); - block_delegations(&dp->dl_fh); + block_delegations(&dp->dl_file->fi_fhandle); /* * We can't do this in nfsd_break_deleg_cb because it is diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 0097d4771521..39747736e83b 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -96,7 +96,6 @@ struct nfs4_delegation { u32 dl_type; time_t dl_time; /* For recall: */ - struct knfsd_fh dl_fh; int dl_retries; struct nfsd4_callback dl_recall; };