Disable FAN_FS_ERROR for release

Keep FAN_FS_ERROR support disabled unconditionally by leaving FAPOLICYD_ENABLE_FANOTIFY_FS_ERROR undefined. The previous configure option is commented out for later restoration, configure reports FAN_FS_ERROR monitoring as no, and the ChangeLog entry advertising FAN_FS_ERROR support was removed from the release notes.

Author: stevegrubb

ChangeLog

@@ -18,7 +18,6 @@
 - Add per-rule hit counters state report to improve observability.
 - Add per-attribute cache hit and lookup counters to improve observability.
 - Split CLI state and metrics reports
-- fapolicyd:  Handle FAN_FS_ERROR health events
 
 1.4.5
 - Inform the admin symlinks were skipped when adding paths

configure.ac

@@ -151,22 +151,25 @@ if test $perm = "no"; then
 fi
 AC_CHECK_DECLS([FAN_MARK_FILESYSTEM], [], [], [[#include <linux/fanotify.h>]])
 
-AC_ARG_ENABLE(fanotify-fs-error,
-AS_HELP_STRING([--disable-fanotify-fs-error],
-[disable FAN_FS_ERROR health monitoring even when supported]),
-[enable_fanotify_fs_error=$enableval],
-[enable_fanotify_fs_error=yes])
-case x$enable_fanotify_fs_error in
-	xyes)
-		AC_DEFINE([FAPOLICYD_ENABLE_FANOTIFY_FS_ERROR], [1],
-			[Define to enable FAN_FS_ERROR health monitoring])
-		;;
-	xno)
-		;;
-	*)
-		AC_MSG_ERROR([bad value $enableval for --enable-fanotify-fs-error])
-		;;
-esac
+enable_fanotify_fs_error=no
+dnl FAN_FS_ERROR shutdown currently exposes a kernel close(2) hang. Keep the
+dnl monitor compiled out until the kernel problem is understood.
+dnl AC_ARG_ENABLE(fanotify-fs-error,
+dnl AS_HELP_STRING([--disable-fanotify-fs-error],
+dnl [disable FAN_FS_ERROR health monitoring even when supported]),
+dnl [enable_fanotify_fs_error=$enableval],
+dnl [enable_fanotify_fs_error=yes])
+dnl case x$enable_fanotify_fs_error in
+dnl 	xyes)
+dnl 		AC_DEFINE([FAPOLICYD_ENABLE_FANOTIFY_FS_ERROR], [1],
+dnl 			[Define to enable FAN_FS_ERROR health monitoring])
+dnl 		;;
+dnl 	xno)
+dnl 		;;
+dnl 	*)
+dnl 		AC_MSG_ERROR([bad value $enableval for --enable-fanotify-fs-error])
+dnl 		;;
+dnl esac
 
 withval=""
 AC_ARG_WITH(rpm,

src/daemon/fanotify-fs-error.c

@@ -606,7 +606,7 @@ int fanotify_fs_error_init(mlist *m)
 	    "the required fanotify info records");
 #else
 	msg(LOG_INFO,
-	    "FAN_FS_ERROR monitoring disabled by configure option");
+	    "FAN_FS_ERROR monitoring disabled");
 #endif
 	return -1;
 }