From: Karel Zak <kzak@redhat.com>
Date: Fri, 11 Sep 2015 09:19:30 +0000 (+0200)
Subject: libmount: (monitor) don't check for regular mtab
X-Git-Tag: v2.28-rc1~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02501746545ef729cefed28b5feb0b4e59c3d34f;p=thirdparty%2Futil-linux.git

libmount: (monitor) don't check for regular mtab

The monitor supports utab only (as documented). It's application
responsibility to use libmount in the right way. It's overkill to
check for valid environment during monitor initialization.

For example systemd checks for regular mtab during boot, it's better
than try to be smart later in libmount monitor when system is already
running.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
index cc3854e5c3..ca9e02c532 100644
--- a/libmount/src/monitor.c
+++ b/libmount/src/monitor.c
@@ -220,7 +220,7 @@ static int userspace_add_watch(struct monitor_entry *me, int *final, int *fd)
 	assert(me->path);
 
 	/*
-	 * libmount uses rename(2) to atomically update utab/mtab, monitor
+	 * libmount uses rename(2) to atomically update utab, monitor
 	 * rename changes is too tricky. It seems better to monitor utab
 	 * lockfile close.
 	 */
@@ -399,10 +399,6 @@ int mnt_monitor_enable_userspace(struct libmnt_monitor *mn, int enable, const ch
 
 	DBG(MONITOR, ul_debugobj(mn, "allocate new userspace monitor"));
 
-	/* create a new entry */
-	if (mnt_has_regular_mtab(NULL, NULL))
-		return -ENOSYS;
-
 	if (!filename)
 		filename = mnt_get_utab_path();		/* /run/mount/utab */
 	if (!filename) {