Update tracing with cluster lock changes

Signed-off-by: Zach Brown <zab@versity.com>

ReleaseNotes.md

@@ -1,25 +1,6 @@
 Versity ScoutFS Release Notes
 =============================
 
----
-v1.5
-\
-*Jun 21, 2022*
-
-* **Fix persistent error during server startup**
-\
-  Fixed a case where the server would always hit a consistent error on
-  seartup, preventing the system from mounting.  This required a rare
-  but valid state across the clients.
-
-* **Fix a client hang that would lead to fencing**
-\
-  The client module's use of in-kernel networking was missing annotation
-  that could lead to communication hanging.  The server would fence the
-  client when it stopped communicating.  This could be identified by the
-  server fencing a client after it disconnected with no attempt by the
-  client to reconnect.
-
 ---
 v1.4
 \

kmod/src/lock.h

@@ -1,6 +1,8 @@
 #ifndef _SCOUTFS_LOCK_H_
 #define _SCOUTFS_LOCK_H_
 
+#include <linux/rhashtable.h>
+
 #include "key.h"
 #include "tseq.h"
 
@@ -19,20 +21,24 @@ struct inode_deletion_lock_data;
  */
 struct scoutfs_lock {
 	struct super_block *sb;
+	atomic_t refcount;
+	spinlock_t lock;
+	struct rcu_head rcu_head;
 	struct scoutfs_key start;
 	struct scoutfs_key end;
-	struct rb_node node;
+	struct rhash_head ht_head;
 	struct rb_node range_node;
 	u64 refresh_gen;
 	u64 write_seq;
 	u64 dirty_trans_seq;
 	struct list_head lru_head;
+	int lru_on_list;
 	wait_queue_head_t waitq;
 	unsigned long request_pending:1,
 		      invalidate_pending:1;
 
 	struct list_head inv_head;  /* entry in linfo's list of locks with invalidations */
-	struct list_head inv_list;  /* list of lock's invalidation requests */
+	struct list_head inv_req_list;  /* list of lock's invalidation requests */
 	struct list_head shrink_head;
 
 	spinlock_t cov_list_lock;

kmod/src/net.c

@@ -991,8 +991,6 @@ static void scoutfs_net_listen_worker(struct work_struct *work)
 		if (ret < 0)
 			break;
 
-		acc_sock->sk->sk_allocation = GFP_NOFS;
-
 		/* inherit accepted request funcs from listening conn */
 		acc_conn = scoutfs_net_alloc_conn(sb, conn->notify_up,
 						  conn->notify_down,
@@ -1055,8 +1053,6 @@ static void scoutfs_net_connect_worker(struct work_struct *work)
 	if (ret)
 		goto out;
 
-	sock->sk->sk_allocation = GFP_NOFS;
-
 	/* caller specified connect timeout */
 	tv.tv_sec = conn->connect_timeout_ms / MSEC_PER_SEC;
 	tv.tv_usec = (conn->connect_timeout_ms % MSEC_PER_SEC) * USEC_PER_MSEC;
@@ -1454,8 +1450,6 @@ int scoutfs_net_bind(struct super_block *sb,
 	if (ret)
 		goto out;
 
-	sock->sk->sk_allocation = GFP_NOFS;
-
 	optval = 1;
 	ret = kernel_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
 				(char *)&optval, sizeof(optval));

kmod/src/scoutfs_trace.h

@@ -1023,6 +1023,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
 		__field(unsigned char, request_pending)
 		__field(unsigned char, invalidate_pending)
 		__field(int, mode)
+		__field(unsigned int, refcount)
 		__field(unsigned int, waiters_cw)
 		__field(unsigned int, waiters_pr)
 		__field(unsigned int, waiters_ex)
@@ -1038,6 +1039,7 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
 		__entry->request_pending = lck->request_pending;
 		__entry->invalidate_pending = lck->invalidate_pending;
 		__entry->mode = lck->mode;
+		__entry->refcount = atomic_read(&lck->refcount);
 		__entry->waiters_pr = lck->waiters[SCOUTFS_LOCK_READ];
 		__entry->waiters_ex = lck->waiters[SCOUTFS_LOCK_WRITE];
 		__entry->waiters_cw = lck->waiters[SCOUTFS_LOCK_WRITE_ONLY];
@@ -1045,10 +1047,10 @@ DECLARE_EVENT_CLASS(scoutfs_lock_class,
 		__entry->users_ex = lck->users[SCOUTFS_LOCK_WRITE];
 		__entry->users_cw = lck->users[SCOUTFS_LOCK_WRITE_ONLY];
         ),
-        TP_printk(SCSBF" start "SK_FMT" end "SK_FMT" mode %u reqpnd %u invpnd %u rfrgen %llu waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u",
+        TP_printk(SCSBF" start "SK_FMT" end "SK_FMT" mode %u reqpnd %u invpnd %u rfrgen %llu rfcnt %d waiters: pr %u ex %u cw %u users: pr %u ex %u cw %u",
 		  SCSB_TRACE_ARGS, sk_trace_args(start), sk_trace_args(end),
 		  __entry->mode, __entry->request_pending,
-		  __entry->invalidate_pending, __entry->refresh_gen,
+		  __entry->invalidate_pending, __entry->refresh_gen, __entry->refcount,
 		  __entry->waiters_pr, __entry->waiters_ex, __entry->waiters_cw,
 		  __entry->users_pr, __entry->users_ex, __entry->users_cw)
 );

kmod/src/server.c

@@ -1267,7 +1267,6 @@ static int server_get_log_trees(struct super_block *sb,
 	char *err_str = NULL;
 	u64 nr;
 	int ret;
-	int err;
 
 	if (arg_len != 0) {
 		ret = -EINVAL;
@@ -1311,27 +1310,16 @@ static int server_get_log_trees(struct super_block *sb,
 		goto unlock;
 	}
 
-	if (ret != -ENOENT) {
-		/* need to sync lt with respect to changes in other structures */
-		scoutfs_key_init_log_trees(&key, le64_to_cpu(lt.rid), le64_to_cpu(lt.nr));
-		ret = scoutfs_btree_dirty(sb, &server->alloc, &server->wri,
-					  &super->logs_root, &key);
-		if (ret < 0) {
-			err_str = "dirtying lt btree key";
-			goto unlock;
-		}
-	}
-
 	/* drops and re-acquires the mutex and commit if it has to wait */
 	ret = finalize_and_start_log_merge(sb, &lt, rid, &hold);
 	if (ret < 0)
-		goto update;
+		goto unlock;
 
 	if (get_volopt_val(server, SCOUTFS_VOLOPT_DATA_ALLOC_ZONE_BLOCKS_NR, &data_zone_blocks)) {
 		ret = get_data_alloc_zone_bits(sb, rid, exclusive, vacant, data_zone_blocks);
 		if (ret < 0) {
 			err_str = "getting alloc zone bits";
-			goto update;
+			goto unlock;
 		}
 	} else {
 		data_zone_blocks = 0;
@@ -1348,13 +1336,13 @@ static int server_get_log_trees(struct super_block *sb,
 					&lt.meta_freed);
 	if (ret < 0) {
 		err_str = "splicing committed meta_freed";
-		goto update;
+		goto unlock;
 	}
 
 	ret = alloc_move_empty(sb, &super->data_alloc, &lt.data_freed, 0);
 	if (ret < 0) {
 		err_str = "emptying committed data_freed";
-		goto update;
+		goto unlock;
 	}
 
 	ret = scoutfs_alloc_fill_list(sb, &server->alloc, &server->wri,
@@ -1363,7 +1351,7 @@ static int server_get_log_trees(struct super_block *sb,
 				      SCOUTFS_SERVER_META_FILL_TARGET);
 	if (ret < 0) {
 		err_str = "filling meta_avail";
-		goto update;
+		goto unlock;
 	}
 
 	if (le64_to_cpu(server->meta_avail->total_len) <= scoutfs_server_reserved_meta_blocks(sb))
@@ -1376,7 +1364,7 @@ static int server_get_log_trees(struct super_block *sb,
 				      exclusive, vacant, data_zone_blocks);
 	if (ret < 0) {
 		err_str = "refilling data_avail";
-		goto update;
+		goto unlock;
 	}
 
 	if (le64_to_cpu(lt.data_avail.total_len) < SCOUTFS_SERVER_DATA_FILL_LO)
@@ -1396,7 +1384,7 @@ static int server_get_log_trees(struct super_block *sb,
 		if (ret < 0) {
 			zero_data_alloc_zone_bits(&lt);
 			err_str = "setting data_avail zone bits";
-			goto update;
+			goto unlock;
 		}
 
 		lt.data_alloc_zone_blocks = cpu_to_le64(data_zone_blocks);
@@ -1405,18 +1393,13 @@ static int server_get_log_trees(struct super_block *sb,
 	/* give the transaction a new seq (must have been ==) */
 	lt.get_trans_seq = cpu_to_le64(scoutfs_server_next_seq(sb));
 
-update:
 	/* update client's log tree's item */
-	scoutfs_key_init_log_trees(&key, le64_to_cpu(lt.rid), le64_to_cpu(lt.nr));
-	err = scoutfs_btree_force(sb, &server->alloc, &server->wri,
+	scoutfs_key_init_log_trees(&key, le64_to_cpu(lt.rid),
+				   le64_to_cpu(lt.nr));
+	ret = scoutfs_btree_force(sb, &server->alloc, &server->wri,
 				  &super->logs_root, &key, &lt, sizeof(lt));
-	BUG_ON(err < 0); /* can duplicate extents.. move dst in super, still in in lt src */
-	if (err < 0) {
-		if (ret == 0) {
-			ret = err;
-			err_str = "updating log trees";
-		}
-	}
+	if (ret < 0)
+		err_str = "updating log trees";
 
 unlock:
 	if (unlock_alloc)

utils/fenced/ipmi-remote-host

@@ -1,140 +0,0 @@
-#!/usr/bin/bash
-# /usr/libexec/scoutfs-fenced/run/ipmi-remote-host
-
-# ipmi configuration
-SCOUTFS_IPMI_CONFIG_FILE=${SCOUTFS_IPMI_CONFIG_FILE:-/etc/scoutfs/scoutfs-ipmi.conf}
-SCOUTFS_IPMI_HOSTS_FILE=${SCOUTFS_IPMI_HOSTS_FILE:-/etc/scoutfs/scoutfs-ipmi-hosts.conf}
-
-## hosts file format
-## SCOUTFS_HOST_IP IPMI_ADDRESS
-## ex:
-#  192.168.1.1     192.168.10.1
-
-# command setup
-IPMI_POWER="/sbin/ipmipower"
-SSH_CMD="ssh -o ConnectTimeout=3 -o BatchMode=yes -o StrictHostKeyChecking=no"
-LOGGER="/bin/logger -p local3.crit -t scoutfs-fenced"
-
-$LOGGER "ipmi fence script invoked: IP: $SCOUTFS_FENCED_REQ_IP RID: $SCOUTFS_FENCED_REQ_RID TEST: $IPMITEST"
-
-echo_fail() {
-    echo "$@" >&2
-    $LOGGER "fence failed: $@"
-    exit 1
-}
-
-echo_log() {
-    echo "$@" >&2
-    $LOGGER "fence info: $@"
-}
-
-echo_test_pass() {
-    echo -e "\xE2\x9C\x94 $@"
-}
-
-echo_test_fail() {
-    echo -e "\xE2\x9D\x8C $@"
-}
-
-test -n "$SCOUTFS_IPMI_CONFIG_FILE" || \
-    echo_fail "SCOUTFS_IPMI_CONFIG_FILE isn't set"
-test -r "$SCOUTFS_IPMI_CONFIG_FILE" || \
-    echo_fail "$SCOUTFS_IPMI_CONFIG_FILE isn't readable file"
-. "$SCOUTFS_IPMI_CONFIG_FILE"
-test -n "$SCOUTFS_IPMI_HOSTS_FILE" || \
-    echo_fail "SCOUTFS_IPMI_HOSTS_FILE isn't set"
-test -r "$SCOUTFS_IPMI_HOSTS_FILE" || \
-    echo_fail "$SCOUTFS_IPMI_HOSTS_FILE isn't readable file"
-test -x "$IPMI_POWER" || \
-    echo_fail "$IPMI_POWER not found, need to install freeimpi?"
-
-export ip="$SCOUTFS_FENCED_REQ_IP"
-export rid="$SCOUTFS_FENCED_REQ_RID"
-
-getIPMIhost () {
-    host=$(awk -v ip="$1" '$1 == ip {print $2}' "$SCOUTFS_IPMI_HOSTS_FILE") || \
-        echo_fail "lookup ipmi host failed"
-    echo "$host"
-}
-
-powerOffHost() {
-    # older versions of ipmipower inverted wait-until-off/wait-until-on, so specify both
-    $IPMI_POWER $IPMI_OPTS -h "$1" --wait-until-off --wait-until-on --off || \
-        echo_fail "ipmi power off $1 failed"
-
-    ipmioutput=$($IPMI_POWER $IPMI_OPTS -h "$1" --stat) || \
-        echo_fail "ipmi power stat $1 failed"
-
-    if [[ ! "$ipmioutput" =~ off ]]; then
-        echo_fail "ipmi stat $1 not off"
-    fi
-
-    $LOGGER "ipmi fence power down $1 success"
-
-    exit 0
-}
-
-if [ -n "$IPMITEST" ]; then
-    for i in $(awk '!/^($|[[:space:]]*#)/ {print $1}' "$SCOUTFS_IPMI_HOSTS_FILE"); do
-        if ! $SSH_CMD "$i" /bin/true; then
-            echo_test_fail "ssh $i"
-        else
-            echo_test_pass "ssh $i"
-        fi
-	host=$(getIPMIhost "$i")
-        if [ -z "$host" ]; then
-            echo_test_fail "ipmi config $i $host"
-        else
-            if ! $IPMI_POWER $IPMI_OPTS -h "$host" --stat; then
-                echo_test_fail "ipmi $i"
-            else
-                echo_test_pass "ipmi $i"
-            fi
-        fi
-    done
-    exit 0
-fi
-
-if [ -z "$ip" ]; then
-    echo_fail "no IP given for fencing"
-fi
-
-host=$(getIPMIhost "$ip")
-if [ -z "$host" ]; then
-    echo_fail "no IPMI host found for fence IP"
-fi
-
-# first check via ssh if the mount still exists
-# if ssh succeeds, we will only power down the node if mounted
-if ! output=$($SSH_CMD "$ip" "echo BEGIN; LC_ALL=C egrep -m 1 '(^0x*|^$rid$)' /sys/kernel/boot_params/version /sys/fs/scoutfs/f*r*/rid; echo END"); then
-    # ssh not working, just power down host
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ BEGIN ]]; then
-    # ssh failure
-    echo_log "no BEGIN"
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ \/boot_params\/ ]]; then
-    # ssh failure
-    echo_log "no boot params"
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ END ]]; then
-    # ssh failure
-    echo_log "no END"
-    powerOffHost "$host"
-fi
-
-if [[ "$output" =~ "rid:$rid" ]]; then
-    # rid still mounted, power down
-    echo_log "rid $rid still mounted"
-    powerOffHost "$host"
-fi
-
-$LOGGER "ipmi fence host $ip/$host success (rid $rid not mounted)"
-exit 0
-

utils/fenced/local-force-unmount

@@ -1,36 +0,0 @@
-#!/usr/bin/bash
-# /usr/libexec/scoutfs-fenced/run/local-force-umount
-
-echo_fail() {
-	echo "$@" > /dev/stderr
-	exit 1
-}
-
-rid="$SCOUTFS_FENCED_REQ_RID"
-
-#
-# Look for a local mount with the rid to fence.  Typically we'll at
-# least find the mount with the server that requested the fence that
-# we're processing.   But it's possible that mounts are unmounted
-# before, or while, we're running.
-#
-mnts=$(findmnt -l -n -t scoutfs -o TARGET) || \
-	echo_fail "findmnt -t scoutfs failed" > /dev/stderr
-
-for mnt in $mnts; do
-	mnt_rid=$(scoutfs statfs -p "$mnt" -s rid) || \
-		echo_fail "scoutfs statfs $mnt failed"
-
-	if [ "$mnt_rid" == "$rid" ]; then
-		umount -f "$mnt" || \
-			echo_fail "umout -f $mnt"
-
-		exit 0
-	fi
-done
-
-#
-# If the mount doesn't exist on this host then it can't access the
-# devices by definition and can be considered fenced.
-#
-exit 0

utils/fenced/powerman-remote-host

@@ -1,139 +0,0 @@
-#!/usr/bin/bash
-# /usr/libexec/scoutfs-fenced/run/powerman-remote-host
-
-# powerman configuration
-SCOUTFS_PM_CONFIG_FILE=${SCOUTFS_PM_CONFIG_FILE:-/etc/scoutfs/scoutfs-pm.conf}
-SCOUTFS_PM_HOSTS_FILE=${SCOUTFS_PM_HOSTS_FILE:-/etc/scoutfs/scoutfs-pm-hosts.conf}
-
-## hosts file format
-## SCOUTFS_HOST_IP POWERMAN_NODE_NAME
-## ex:
-#  192.168.1.1     dm1
-
-# command setup
-PM_CMD="/usr/bin/pm"
-SSH_CMD="ssh -o ConnectTimeout=3 -o BatchMode=yes -o StrictHostKeyChecking=no"
-LOGGER="/bin/logger -p local3.crit -t scoutfs-fenced"
-
-$LOGGER "ipmi fence script invoked: IP: $SCOUTFS_FENCED_REQ_IP RID: $SCOUTFS_FENCED_REQ_RID TEST: $IPMITEST"
-
-echo_fail() {
-    echo "$@" >&2
-    $LOGGER "fence failed: $@"
-    exit 1
-}
-
-echo_log() {
-    echo "$@" >&2
-    $LOGGER "fence info: $@"
-}
-
-echo_test_pass() {
-    echo -e "\xE2\x9C\x94 $@"
-}
-
-echo_test_fail() {
-    echo -e "\xE2\x9D\x8C $@"
-}
-
-test -n "$SCOUTFS_PM_CONFIG_FILE" || \
-    echo_fail "SCOUTFS_PM_CONFIG_FILE isn't set"
-test -r "$SCOUTFS_PM_CONFIG_FILE" || \
-    echo_fail "$SCOUTFS_PM_CONFIG_FILE isn't readable file"
-. "$SCOUTFS_PM_CONFIG_FILE"
-test -n "$SCOUTFS_PM_HOSTS_FILE" || \
-    echo_fail "SCOUTFS_PM_HOSTS_FILE isn't set"
-test -r "$SCOUTFS_PM_HOSTS_FILE" || \
-    echo_fail "$SCOUTFS_PM_HOSTS_FILE isn't readable file"
-test -x "$PM_CMD" || \
-    echo_fail "$PMCMD not found, need to install powerman?"
-
-export ip="$SCOUTFS_FENCED_REQ_IP"
-fence_rid="$SCOUTFS_FENCED_REQ_RID"
-
-getPMhost () {
-    host=$(awk -v ip="$1" '$1 == ip {print $2}' "$SCOUTFS_PM_HOSTS_FILE") || \
-        echo_fail "lookup pm host failed"
-    echo "$host"
-}
-
-powerOffHost() {
-    $PM_CMD $PM_OPTS "$1" -0 || \
-        echo_fail "pm power off $host failed"
-
-    pmoutput=$($PM_CMD $PM_OPTS "$1" -q | grep "$1") || \
-        echo_fail "powerman power stat $1 failed"
-
-    if [[ ! "$pmoutput" =~ off ]]; then
-        echo_fail "powerman stat $1 not off"
-    fi
-
-    $LOGGER "powerman fence power down $1 success"
-
-    exit 0
-}
-
-if [ -n "$PMTEST" ]; then
-    for i in $(awk '!/^($|[[:space:]]*#)/ {print $1}' "$SCOUTFS_PM_HOSTS_FILE"); do
-        if ! $SSH_CMD "$i" /bin/true; then
-            echo_test_fail "ssh $i"
-        else
-            echo_test_pass "ssh $i"
-        fi
-	host=$(getPMhost "$i")
-        if [ -z "$host" ]; then
-            echo_test_fail "pm config $i $host"
-        else
-            if ! $PM_CMD $PM_OPTS "$host" -q; then
-                echo_test_fail "pm $i"
-            else
-                echo_test_pass "pm $i"
-            fi
-        fi
-    done
-    exit 0
-fi
-
-if [ -z "$ip" ]; then
-    echo_fail "no IP given for fencing"
-fi
-
-host=$(getPMhost "$ip")
-if [ -z "$host" ]; then
-    echo_fail "no host found for fence IP"
-fi
-
-# first check via ssh if the mount still exists
-# if ssh succeeds, we will only power down the node if mounted
-if ! output=$($SSH_CMD "$ip" "echo BEGIN; LC_ALL=C egrep -m 1 '(^0x*|^$rid$)' /sys/kernel/boot_params/version /sys/fs/scoutfs/f*r*/rid; echo END"); then
-    # ssh not working, just power down host
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ BEGIN ]]; then
-    # ssh failure
-    echo_log "no BEGIN"
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ \/boot_params\/ ]]; then
-    # ssh failure
-    echo_log "no boot params"
-    powerOffHost "$host"
-fi
-
-if [[ ! "$output" =~ END ]]; then
-    # ssh failure
-    echo_log "no END"
-    powerOffHost "$host"
-fi
-
-if [[ "$output" =~ "rid:$rid" ]]; then
-    # rid still mounted, power down
-    echo_log "rid $rid still mounted"
-    powerOffHost "$host"
-fi
-
-$LOGGER "powerman fence host $ip/$host success (rid $rid not mounted)"
-exit 0
-

utils/fenced/scoutfs-ipmi-hosts.conf

@@ -1,11 +0,0 @@
-# /etc/scoutfs/scoutfs-ipmi-hosts.conf
-
-## config file format
-##
-## SCOUTFS_HOST_IP must match the interface used for scoutfs
-## leader/follower communications
-##
-## SCOUTFS_HOST_IP IPMI_ADDRESS
-## ex:
-#192.168.1.1     192.168.10.1
-

utils/fenced/scoutfs-ipmi.conf

@@ -1,10 +0,0 @@
-#!/usr/bin/bash
-# /etc/scoutfs/scoutfs-ipmi.conf
-
-IPMI_USER="admin"
-IPMI_PASSWORD="password"
-IPMI_OPTS="-D LAN_2_0 -u $IPMI_USER -p $IPMI_PASSWORD"
-
-# some Intel BMCs need -I 17
-# IPMI_OPTS="-D LAN_2_0 -u $IPMI_USER -p $IPMI_PASSWORD -I 17"
-

utils/fenced/scoutfs-pm-hosts.conf

@@ -1,11 +0,0 @@
-# /etc/scoutfs/scoutfs-ipmi-hosts.conf
-
-## config file format
-##
-## SCOUTFS_HOST_IP must match the interface used for scoutfs
-## leader/follower communications
-##
-## SCOUTFS_HOST_IP POWERMAN_NODE_NAME
-## ex:
-#192.168.1.1     node1
-

utils/fenced/scoutfs-pm.conf

@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-# /etc/scoutfs/scoutfs-pm.conf
-
-PM_OPTS=""
-
-# optionally specify remote powerman server
-#PM_OPTS="-h pm-server.localdomain"
-

utils/scoutfs-utils.spec.in

@@ -55,21 +55,14 @@ install -m 755 -D src/scoutfs $RPM_BUILD_ROOT%{_sbindir}/scoutfs
 install -m 644 -D src/ioctl.h $RPM_BUILD_ROOT%{_includedir}/scoutfs/ioctl.h
 install -m 644 -D src/format.h $RPM_BUILD_ROOT%{_includedir}/scoutfs/format.h
 install -m 755 -D fenced/scoutfs-fenced $RPM_BUILD_ROOT%{_libexecdir}/scoutfs-fenced/scoutfs-fenced
-install -m 755 -D fenced/local-force-unmount $RPM_BUILD_ROOT%{_libexecdir}/scoutfs-fenced/run/local-force-unmount
-install -m 755 -D fenced/ipmi-remote-host $RPM_BUILD_ROOT%{_libexecdir}/scoutfs-fenced/run/ipmi-remote-host
-install -m 755 -D fenced/powerman-remote-host $RPM_BUILD_ROOT%{_libexecdir}/scoutfs-fenced/run/powerman-remote-host
 install -m 644 -D fenced/scoutfs-fenced.service $RPM_BUILD_ROOT%{_unitdir}/scoutfs-fenced.service
 install -m 644 -D fenced/scoutfs-fenced.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/scoutfs/scoutfs-fenced.conf.example
-install -m 644 -D fenced/scoutfs-ipmi.conf $RPM_BUILD_ROOT%{_sysconfdir}/scoutfs/scoutfs-ipmi.conf
-install -m 644 -D fenced/scoutfs-ipmi-hosts.conf $RPM_BUILD_ROOT%{_sysconfdir}/scoutfs/scoutfs-ipmi-hosts.conf
-install -m 644 -D fenced/scoutfs-pm.conf $RPM_BUILD_ROOT%{_sysconfdir}/scoutfs/scoutfs-pm.conf
-install -m 644 -D fenced/scoutfs-pm-hosts.conf $RPM_BUILD_ROOT%{_sysconfdir}/scoutfs/scoutfs-pm-hosts.conf
 
 %files
 %defattr(644,root,root,755)
 %{_mandir}/man*/scoutfs*.gz
 %{_unitdir}/scoutfs-fenced.service
-%config(noreplace) %{_sysconfdir}/scoutfs
+%{_sysconfdir}/scoutfs
 %defattr(755,root,root,755)
 %{_sbindir}/scoutfs
 %{_libexecdir}/scoutfs-fenced