libmount: don't base GC startup on no-mtab context

PATCH Applied Dan McGee 2 participants 2 messages Sep 1, 2014 – Sep 2, 2014 1 message not in the archive NILFS2 filesystem

lore

Share & tools

lore

Dan McGee

author

2014-09-01 19:45 UTC #0 lore raw

PATCH 1/1 libmount: don't base GC startup on no-mtab context

When mtab is a symlink to /proc/mounts, libmount uses /run/mount/utab to store filesystem-specific mount attributes, making this check unnecessary. Worse, it now breaks nilfs_cleanerd under systemd 216+ since it always passes -n to the mount command.

Signed-off-by Dan McGee <dan-fd97jBR+K/[email protected]>

---
 sbin/mount/mount_libmount.c | 6 ------
 1 file changed, 6 deletions(-)

sbin/mount/mount_libmount.c +0 -6

index c518475..b901654 100644
@@ -404,12 +404,6 @@ static int nilfs_update_mount_state(struct nilfs_mount_info *mi)
 	rungc = gc_ok && !mi->new_attrs.nogc;
 	old_attrs = (mi->mflags & MS_REMOUNT) ? &mi->old_attrs : NULL;
 
-	if (mnt_context_is_nomtab(cxt)) {
-		if (rungc)
-			printf(_("%s not started\n"), NILFS_CLEANERD_NAME);
-		return 0;
-	}
-
 	if (rungc) {
 		if (mi->new_attrs.pp == ULONG_MAX)
 			mi->new_attrs.pp = mi->old_attrs.pp;

Signature · 6 lines

2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1409600714-25174-1-git-send-email-dan-fd97jBR+K/[email protected]

Ryusuke Konishi

Applied

2014-09-02 17:16 UTC #2 lore raw

Quoted 6 lines · Dan McGee

When mtab is a symlink to /proc/mounts, libmount uses /run/mount/utab to store filesystem-specific mount attributes, making this check unnecessary. Worse, it now breaks nilfs_cleanerd under systemd 216+ since it always passes -n to the mount command.
Signed-off-by Dan McGee <dan-fd97jBR+K/[email protected]>

Applied, thank you!

Ryusuke Konishi

Quoted 28 lines

---
 sbin/mount/mount_libmount.c | 6 ------
 1 file changed, 6 deletions(-)

sbin/mount/mount_libmount.c +0 -6

index c518475..b901654 100644
@@ -404,12 +404,6 @@ static int nilfs_update_mount_state(struct nilfs_mount_info *mi)
 	rungc = gc_ok && !mi->new_attrs.nogc;
 	old_attrs = (mi->mflags & MS_REMOUNT) ? &mi->old_attrs : NULL;
 
-	if (mnt_context_is_nomtab(cxt)) {
-		if (rungc)
-			printf(_("%s not started\n"), NILFS_CLEANERD_NAME);
-		return 0;
-	}
-
 	if (rungc) {
 		if (mi->new_attrs.pp == ULONG_MAX)
 			mi->new_attrs.pp = mi->old_attrs.pp;

Signature · 6 lines

2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html