build: merge our 3.6 and upstream 3.8 configure/specfile

Summary:
They have a common ancestor at 3.6, but there were hundreds of
lines of changes for each file on each side of the fork. In both
cases the easiest method was to take the upstream 3.8 version and
re-apply our own changes since we branched. Some changes were
dropped (e.g. runit) and a few other files needed new changes
(e.g. pkg-version) to keep up. Then there was more hacking to
fix stealth geo-rep dependencies, enable tirpc/IPv6, and so on.

Also added buildrpm38 and makerelease38.  These should probably
not go upstream, but not sure what else to do with them.

Test Plan: Build RPMs. Install, create volumes, mount, do I/O.

Reviewers: sshreyas, #posix_storage

Reviewed By: sshreyas

Subscribers: jbacik, aquevedo, scientist, sshreyas, calvinowens, jweiner

Differential Revision: https://phabricator.intern.facebook.com/D6259797

Tasks: T20348589

Tags: posix-2017h2, gluster, posix_storage

Change-Id: I2d43fc6f7f5603293e406c21e4ec85bf19610b77
Signature: 6259797:1510694123:fc5d2975fec134a51d4b70f7f983cd71971e175a

2 files changed, 34 insertions, 0 deletions

diff --git a/xlators/mount/fuse/utils/Makefile.am b/xlators/mount/fuse/utils/Makefile.am
index fdad27ad103..da646dbf9b0 100644
--- a/xlators/mount/fuse/utils/Makefile.am
+++ b/xlators/mount/fuse/utils/Makefile.am
@@ -2,6 +2,9 @@ utildir = @mountutildir@
 
 if GF_LINUX_HOST_OS
 util_SCRIPTS = mount.glusterfs
+if GF_FBEXTRAS
+util_SCRIPTS += umount.fuse.glusterfs
+endif
 else
 util_SCRIPTS = mount_glusterfs
 endif
diff --git a/xlators/mount/fuse/utils/umount.fuse.glusterfs.in b/xlators/mount/fuse/utils/umount.fuse.glusterfs.in
new file mode 100644
index 00000000000..6a94d3933ff
--- /dev/null
+++ b/xlators/mount/fuse/utils/umount.fuse.glusterfs.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# If $1 is a mountpoint, return it; else if it is a mounted device,
+# return the mountpoint for the device; else return eror.
+#
+# value returned in global $mountpoint.
+get_mountpoint() {
+    if mountpoint -q -- $1; then
+        mountpoint=$1
+        return 0
+    fi
+
+    mountpoint=$(grep "^$1" /proc/mounts | cut -d' ' -f2)
+
+    if [ -n "$mountpoint" ]; then
+        return 0
+    fi
+
+    return 1
+}
+
+for arg in $@; do
+    if get_mountpoint $arg; then
+        # Please keep in sync with mount script, which starts this process.
+        squashed_mountpoint=$(echo ${mountpoint} | sed s^/^_^g)
+        pkill -f "gfs_clientstats_scuba.*gfs_client${squashed_mountpoint}.log"
+        pkill -f "gfs_clientstats_ods.*_${squashed_mountpoint}.dump"
+     fi
+done
+
+umount -i $@