From: Steve Dickson <steved@redhat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH 5/7] exportd: Enabled junction support
Date: Fri, 19 Feb 2021 15:08:13 -0500 [thread overview]
Message-ID: <20210219200815.792667-6-steved@redhat.com> (raw)
In-Reply-To: <20210219200815.792667-1-steved@redhat.com>
Moved the junction support from mountd to libexport.a
so both exportd and mountd can use the code.
Signed-off-by: Steve Dickson <steved@redhat.com>
---
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 \
--
2.29.2
next prev parent reply other threads:[~2021-02-19 20:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 20:08 [PATCH 0/7 V4] The NFSv4 only mounting daemon Steve Dickson
2021-02-19 20:08 ` [PATCH 1/7] exportd: the initial shell of the v4 export support Steve Dickson
2021-02-19 20:08 ` [PATCH 2/7] exportd: Moved cache upcalls routines into libexport.a Steve Dickson
2021-02-23 16:13 ` [PATCH] exportd: server-side gid management Daniel Kobras
2021-03-04 21:28 ` Steve Dickson
2021-02-19 20:08 ` [PATCH 3/7] exportd: multiple threads Steve Dickson
2021-02-19 20:08 ` [PATCH 4/7] exportd/exportfs: Add the state-directory-path option Steve Dickson
2021-02-19 20:08 ` Steve Dickson [this message]
2021-02-19 20:08 ` [PATCH 6/7] exportd: systemd unit files Steve Dickson
2021-02-19 20:08 ` [PATCH 7/7] exportd: Added config variable to compile in the NFSv4 only server Steve Dickson
2021-02-20 16:33 ` [PATCH 0/7 V4] The NFSv4 only mounting daemon Steve Dickson
2021-02-24 20:30 ` J. Bruce Fields
2021-03-02 22:33 ` Steve Dickson
2021-03-03 15:23 ` J. Bruce Fields
2021-03-03 21:22 ` Steve Dickson
2021-03-03 21:54 ` J. Bruce Fields
2021-03-03 22:07 ` Steve Dickson
2021-03-03 22:17 ` J. Bruce Fields
2021-03-04 13:57 ` Steve Dickson
2021-03-04 14:06 ` J. Bruce Fields
2021-03-04 16:31 ` Steve Dickson
2021-03-05 14:36 ` J. Bruce Fields
2021-03-05 15:53 ` Chuck Lever
2021-03-04 13:42 ` Steve Dickson
2021-03-04 14:01 ` J. Bruce Fields
2021-03-04 16:47 ` Steve Dickson
2021-03-04 21:31 ` Patrick Goetz
2021-03-04 13:34 ` Steve Dickson
2021-03-04 14:24 ` J. Bruce Fields
2021-03-04 16:20 ` Steve Dickson
2021-02-24 20:49 ` J. Bruce Fields
2021-03-02 22:39 ` Steve Dickson
2021-03-03 18:10 ` Chuck Lever
2021-03-03 21:24 ` Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219200815.792667-6-steved@redhat.com \
--to=steved@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).