From patchwork Fri Feb 19 20:08:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 12096081 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AC50C4332B for ; Fri, 19 Feb 2021 20:08:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 235DC64EB7 for ; Fri, 19 Feb 2021 20:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbhBSUIN (ORCPT ); Fri, 19 Feb 2021 15:08:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23766 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229555AbhBSUIK (ORCPT ); Fri, 19 Feb 2021 15:08:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613765204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sgwxhz8gxuq+JNCh7YtYmopfxScAxC6V8+cRfi+fb7M=; b=coVu70TW3RFEbC1Cc4Gk79X+fW6shKGICY0w6T0WC6ZvbwAVqiAdJHYHwH56nQR/rwwWKG bwIHcaMj9b1Y0JDJ64IHLhIffI7mVjHE6JXIClc5qIdksht9RepfQTIEXyvOMejg4BBXU5 TARLLreP2wUj5cyMaD3304gwfHk8e6I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-uNMYQloRPwGrRX3NTTP9Yw-1; Fri, 19 Feb 2021 15:06:41 -0500 X-MC-Unique: uNMYQloRPwGrRX3NTTP9Yw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE7DD18449E2 for ; Fri, 19 Feb 2021 20:06:40 +0000 (UTC) Received: from madhat.home.dicksonnet.net (ovpn-112-108.phx2.redhat.com [10.3.112.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACD81189C4 for ; Fri, 19 Feb 2021 20:06:40 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 5/7] exportd: Enabled junction support Date: Fri, 19 Feb 2021 15:08:13 -0500 Message-Id: <20210219200815.792667-6-steved@redhat.com> In-Reply-To: <20210219200815.792667-1-steved@redhat.com> References: <20210219200815.792667-1-steved@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Moved the junction support from mountd to libexport.a so both exportd and mountd can use the code. Signed-off-by: Steve Dickson --- support/export/Makefile.am | 2 +- {utils/mountd => support/export}/fsloc.c | 0 {utils/mountd => support/include}/fsloc.h | 0 utils/exportd/Makefile.am | 3 +++ utils/mountd/Makefile.am | 3 +-- 5 files changed, 5 insertions(+), 3 deletions(-) rename {utils/mountd => support/export}/fsloc.c (100%) rename {utils/mountd => support/include}/fsloc.h (100%) diff --git a/support/export/Makefile.am b/support/export/Makefile.am index 7de82a8..a9e710c 100644 --- a/support/export/Makefile.am +++ b/support/export/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST = mount.x noinst_LIBRARIES = libexport.a libexport_a_SOURCES = client.c export.c hostname.c \ xtab.c mount_clnt.c mount_xdr.c \ - cache.c auth.c v4root.c + cache.c auth.c v4root.c fsloc.c BUILT_SOURCES = $(GENFILES) noinst_HEADERS = mount.h diff --git a/utils/mountd/fsloc.c b/support/export/fsloc.c similarity index 100% rename from utils/mountd/fsloc.c rename to support/export/fsloc.c diff --git a/utils/mountd/fsloc.h b/support/include/fsloc.h similarity index 100% rename from utils/mountd/fsloc.h rename to support/include/fsloc.h diff --git a/utils/exportd/Makefile.am b/utils/exportd/Makefile.am index eb0f0a8..eb521f1 100644 --- a/utils/exportd/Makefile.am +++ b/utils/exportd/Makefile.am @@ -1,6 +1,9 @@ ## Process this file with automake to produce Makefile.in OPTLIBS = +if CONFIG_JUNCTION +OPTLIBS += ../../support/junction/libjunction.la $(LIBXML2) +endif man8_MANS = exportd.man EXTRA_DIST = $(man8_MANS) diff --git a/utils/mountd/Makefile.am b/utils/mountd/Makefile.am index cac3275..859f28e 100644 --- a/utils/mountd/Makefile.am +++ b/utils/mountd/Makefile.am @@ -12,9 +12,8 @@ RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = mountd -noinst_HEADERS = fsloc.h mountd_SOURCES = mountd.c mount_dispatch.c rmtab.c \ - svc_run.c fsloc.c mountd.h + svc_run.c mountd.h mountd_LDADD = ../../support/export/libexport.a \ ../../support/nfs/libnfs.la \ ../../support/misc/libmisc.a \