libnsm.a: Move the sm_inter XDR pieces to libnsm.a
Subsystems (2)
PATCH 1/1 libnsm.a: Move the sm_inter XDR pieces to libnsm.a
Clean up: Move the .x file and the generated C source for NSM to libnsm.a, echoing the architecture of mountd and exportfs. This makes the NSM protocol definitions, data types, and XDR routines available to be shared across nfs-utils.
This simplifies the addition of other NSM-related code (for example for testing or providing clustering support), and also provides public data type definitions that can be used to make sense of the contents of statd's on-disk database.
Because sim_sm_inter.x still resides in utils/statd, I've left some rpcgen build magic in utils/statd/Makefile.am.
This is an internal organization change only. This patch should not affect code behavior in any way.
---
Steve-
Another in the statd IPv6 series.
.gitignore | 9 ++- configure.ac | 1 support/Makefile.am | 2 - support/nsm/Makefile.am | 45 ++++++++++++++++ support/nsm/sm_inter.x | 131 +++++++++++++++++++++++++++++++++++++++++++++++ utils/statd/Makefile.am | 16 ++---- utils/statd/sm_inter.x | 131 ----------------------------------------------- 7 files changed, 188 insertions(+), 147 deletions(-) create mode 100644 support/nsm/Makefile.am create mode 100644 support/nsm/sm_inter.x delete mode 100644 utils/statd/sm_inter.x
.gitignore +5 -4
@@ -55,10 +55,11 @@ support/export/mount.h support/export/mount_clnt.c support/export/mount_xdr.c support/include/mount.h -utils/statd/sm_inter.h -utils/statd/sm_inter_clnt.c -utils/statd/sm_inter_svc.c -utils/statd/sm_inter_xdr.c +support/nsm/sm_inter.h +support/nsm/sm_inter_clnt.c +support/nsm/sm_inter_svc.c +support/nsm/sm_inter_xdr.c +support/include/sm_inter.h # cscope database files cscope.* # generic editor backup et al
configure.ac +1 -0
@@ -402,6 +402,7 @@ AC_CONFIG_FILES([ support/include/Makefile support/misc/Makefile support/nfs/Makefile + support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile
support/Makefile.am +1 -1
@@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = export include misc nfs +SUBDIRS = export include misc nfs nsm MAINTAINERCLEANFILES = Makefile.in
support/nsm/Makefile.am new file +45 -0
45 lines not on this page · raw message
support/nsm/sm_inter.x new file +131 -0
131 lines not on this page · raw message
utils/statd/Makefile.am +5 -11
@@ -2,32 +2,26 @@ man8_MANS = statd.man sm-notify.man -GENFILES_CLNT = sm_inter_clnt.c -GENFILES_SVC = sm_inter_svc.c -GENFILES_XDR = sm_inter_xdr.c -GENFILES_H = sm_inter.h - -GENFILES = $(GENFILES_CLNT) $(GENFILES_SVC) $(GENFILES_XDR) $(GENFILES_H) - RPCPREFIX = rpc. KPREFIX = @kprefix@ sbin_PROGRAMS = statd sm-notify dist_sbin_SCRIPTS = start-statd statd_SOURCES = callback.c notlist.c misc.c monitor.c \ simu.c stat.c statd.c svc_run.c rmtcall.c \ - sm_inter_clnt.c sm_inter_svc.c sm_inter_xdr.c \ - notlist.h statd.h system.h version.h sm_inter.h + notlist.h statd.h system.h version.h sm_notify_SOURCES = sm-notify.c BUILT_SOURCES = $(GENFILES) statd_LDADD = ../../support/export/libexport.a \ + ../../support/nsm/libnsm.a \ ../../support/nfs/libnfs.a \ ../../support/misc/libmisc.a \ $(LIBWRAP) $(LIBNSL) -sm_notify_LDADD = ../../support/nfs/libnfs.a \ +sm_notify_LDADD = ../../support/nsm/libnsm.a \ + ../../support/nfs/libnfs.a \ $(LIBNSL) -EXTRA_DIST = sim_sm_inter.x sm_inter.x $(man8_MANS) COPYRIGHT simulate.c +EXTRA_DIST = sim_sm_inter.x $(man8_MANS) COPYRIGHT simulate.c if CONFIG_RPCGEN RPCGEN = $(top_builddir)/tools/rpcgen/rpcgen
utils/statd/sm_inter.x deleted +0 -131
131 lines not on this page · raw message
A message that is not in the archive (sent off-list or not yet received): 20091215163102.14858.69699.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Quoted 16 lines · Chuck Lever
Clean up: Move the .x file and the generated C source for NSM to libnsm.a, echoing the architecture of mountd and exportfs. This makes the NSM protocol definitions, data types, and XDR routines available to be shared across nfs-utils.
This simplifies the addition of other NSM-related code (for example for testing or providing clustering support), and also provides public data type definitions that can be used to make sense of the contents of statd's on-disk database.
Because sim_sm_inter.x still resides in utils/statd, I've left some rpcgen build magic in utils/statd/Makefile.am.
This is an internal organization change only. This patch should not affect code behavior in any way.
Quoted 7 lines
Signed-off-by Chuck Lever <[email protected]>---
Steve-
Another in the statd IPv6 series.
Committed...
steved.