Merge pull request #10243 from jcsp/wip-cephfs-cleanup

CephFS: misc. cleanups and remove legacy cephfs tool Reviewed-by: Nathan Cutler <ncutler@suse.com>
ceph · Jul 25, 2016 · 2dbff88 · 2dbff88
2 parents 55691af + 1f1ef81
commit 2dbff88
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 479 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -750,7 +750,6 @@ rm -rf %{buildroot}
 %{_bindir}/ceph-run
 %{_bindir}/ceph-detect-init
 %{_bindir}/ceph-client-debug
-%{_bindir}/cephfs
 %{_unitdir}/ceph-create-keys@.service
 %{_libexecdir}/systemd/system-preset/50-ceph.preset
 %{_sbindir}/ceph-create-keys
@@ -788,7 +787,6 @@ rm -rf %{buildroot}
 %{_mandir}/man8/crushtool.8*
 %{_mandir}/man8/osdmaptool.8*
 %{_mandir}/man8/monmaptool.8*
-%{_mandir}/man8/cephfs.8*
 #set up placeholder directories
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/tmp
 %attr(750,ceph,ceph) %dir %{_localstatedir}/lib/ceph/bootstrap-osd

diff --git a/debian/ceph-fs-common.install b/debian/ceph-fs-common.install
@@ -1,4 +1,2 @@
 usr/sbin/mount.ceph sbin
-usr/bin/cephfs
-usr/share/man/man8/cephfs.8
 usr/share/man/man8/mount.ceph.8
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -8,7 +8,6 @@ EXTRA_DIST = \
 	man/8/ceph-deploy.rst	\
 	man/8/ceph-detect-init.rst	\
 	man/8/ceph-disk.rst	\
-	man/8/cephfs.rst	\
 	man/8/ceph-fuse.rst	\
 	man/8/ceph-mds.rst	\
 	man/8/ceph-mon.rst	\

diff --git a/doc/man/8/CMakeLists.txt b/doc/man/8/CMakeLists.txt
@@ -35,11 +35,6 @@ list(APPEND man_srcs
   ceph-mds.rst
   librados-config.rst)
 
-if(WITH_CEPHFS)
-  list(APPEND man_srcs
-    cephfs.rst)
-endif()
-
 if(HAVE_LIBFUSE)
   list(APPEND man_srcs
     ceph-fuse.rst

diff --git a/doc/man/8/cephfs.rst b/doc/man/8/cephfs.rst
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -682,11 +682,6 @@ add_subdirectory(erasure-code)
 add_subdirectory(googletest/googlemock)
 
 add_subdirectory(test)
-set(cephfs_srcs cephfs.cc)
-add_executable(cephfstool ${cephfs_srcs})
-target_link_libraries(cephfstool common ${EXTRALIBS})
-set_target_properties(cephfstool PROPERTIES OUTPUT_NAME cephfs)
-install(TARGETS cephfstool DESTINATION bin)
 
 add_subdirectory(compressor)
 add_subdirectory(tools)

diff --git a/src/Makefile-client.am b/src/Makefile-client.am
@@ -74,10 +74,6 @@ endif # WITH_FUSE
 
 
 if WITH_CEPHFS
-cephfs_SOURCES = cephfs.cc
-cephfs_LDADD = $(LIBCOMMON)
-bin_PROGRAMS += cephfs
-
 mount_ceph_SOURCES = mount/mount.ceph.c
 mount_ceph_LDADD = $(LIBSECRET) $(LIBCOMMON)
 if LINUX