From patchwork Wed Aug 5 21:13:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 6953141 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2FBB99F39D for ; Wed, 5 Aug 2015 21:14:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A5A82052C for ; Wed, 5 Aug 2015 21:14:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80959204AB for ; Wed, 5 Aug 2015 21:14:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752784AbbHEVN4 (ORCPT ); Wed, 5 Aug 2015 17:13:56 -0400 Received: from mail-yk0-f178.google.com ([209.85.160.178]:33363 "EHLO mail-yk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752471AbbHEVNy (ORCPT ); Wed, 5 Aug 2015 17:13:54 -0400 Received: by ykoo205 with SMTP id o205so46666636yko.0 for ; Wed, 05 Aug 2015 14:13: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:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mVvbd21Tb2CWdmOpFdK4nLkV6RRn2WettltWahjY15Y=; b=Kijy0y3diWTA7P5bqPVqCmZz0+j1oc19y2eHgBfSly4og1LTDs64E7UiIRJokGTV6/ wHN1jHffvPpuYAsFME4zwFR7Ts3oAK66rohMNFyKu2MQ9LqcQAFPlw8Gtb/o7STjcCSo E3bsoPZU5uNqmdTSY9ZpcUO1kLCDvSb1FORdqclGK+VruZYwxdsj9Zdl5/82GUD9fbLs 62qv2ZrH6TFGNSfb74YGp3WS8NSusQVd+fYhY59GydFKM3xD8yovEwVn8ILpL30KKYNr NIR8qqSbAbtt2vpAOaUon68Q/jelfRkCITVA1cK5ZxPsRp0CQR2KB45jpF7iKxfI3Eop 8tPQ== X-Gm-Message-State: ALoCoQlPg5pPhvSnZyQkM/B+KSlfrwj8R3Jqc17NSwP3PXaVjQSNnUyFGZ9GyT6eCcb3bGkaM44S X-Received: by 10.13.251.1 with SMTP id l1mr11529191ywf.174.1438809234100; Wed, 05 Aug 2015 14:13:54 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-45-37-211-243.nc.res.rr.com. [45.37.211.243]) by smtp.googlemail.com with ESMTPSA id p81sm3975306ywe.19.2015.08.05.14.13.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 14:13:53 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 15/18] nfsd: have set_version_and_fsid_type take a knfsd_fh instead of svc_fh Date: Wed, 5 Aug 2015 17:13:33 -0400 Message-Id: <1438809216-4846-16-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438809216-4846-1-git-send-email-jeff.layton@primarydata.com> References: <1438264341-18048-1-git-send-email-jeff.layton@primarydata.com> <1438809216-4846-1-git-send-email-jeff.layton@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=-7.0 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 Note however that we do still have it take a svc_fh for the ref_fh, but that could be changed in the future if it's helpful to do so. Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig --- fs/nfsd/nfsfh.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index a945500db17c..b601f291d825 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -454,7 +454,9 @@ static bool fsid_type_ok_for_exp(u8 fsid_type, struct svc_export *exp) } -static void set_version_and_fsid_type(struct svc_fh *fhp, struct svc_export *exp, struct svc_fh *ref_fh) +static void +set_version_and_fsid_type(struct knfsd_fh *kfh, int maxsize, + struct svc_export *exp, struct svc_fh *ref_fh) { u8 version; u8 fsid_type; @@ -487,7 +489,7 @@ retry: } else if (exp->ex_flags & NFSEXP_FSID) { fsid_type = FSID_NUM; } else if (exp->ex_uuid) { - if (fhp->fh_maxsize >= 64) { + if (maxsize >= 64) { if (is_root_export(exp)) fsid_type = FSID_UUID16; else @@ -503,9 +505,9 @@ retry: fsid_type = FSID_ENCODE_DEV; else fsid_type = FSID_DEV; - fhp->fh_handle.fh_version = version; + kfh->fh_version = version; if (version) - fhp->fh_handle.fh_fsid_type = fsid_type; + kfh->fh_fsid_type = fsid_type; } __be32 @@ -533,7 +535,8 @@ fh_compose(struct svc_fh *fhp, struct svc_export *exp, struct dentry *dentry, * the reference filehandle (if it is in the same export) * or the export options. */ - set_version_and_fsid_type(fhp, exp, ref_fh); + set_version_and_fsid_type(&fhp->fh_handle, fhp->fh_maxsize, + exp, ref_fh); if (ref_fh == fhp) fh_put(ref_fh);