All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denys Vlasenko <vda.linux@googlemail.com>
To: Ian Kent <raven@themaw.net>
Cc: autofs@linux.kernel.org
Subject: [PATCH] 5.0.0_beta1: uncomment "-f --foreground..." help text; comment out unused stuff.
Date: Wed, 26 Sep 2007 10:48:47 +0100	[thread overview]
Message-ID: <200709261048.48044.vda.linux@googlemail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 71 bytes --]

Hi Ian,

Please apply attached trivial patch. It is run-tested.
--
vda

[-- Attachment #2: autofs-5.0.0_beta1-fg.patch --]
[-- Type: text/x-diff, Size: 1736 bytes --]

diff -d -urpN autofs-5.0.0_beta1/daemon/automount.c autofs-5.0.0_beta1-fg/daemon/automount.c
--- autofs-5.0.0_beta1/daemon/automount.c	2006-05-02 08:37:35.000000000 +0100
+++ autofs-5.0.0_beta1-fg/daemon/automount.c	2007-09-26 10:27:30.000000000 +0100
@@ -413,6 +413,7 @@ int count_mounts(struct autofs_point *ap
 	return counter.count;
 }
 
+/* UNUSED
 static void check_rm_dirs(struct autofs_point *ap, const char *path, int incl)
 {
 	if ((!ap->ghost) ||
@@ -423,6 +424,7 @@ static void check_rm_dirs(struct autofs_
 	else if (ap->ghost && (ap->type == LKP_INDIRECT))
 		rm_unwanted(path, 0, ap->dev);
 }
+*/
 
 /* umount all filesystems mounted under path.  If incl is true, then
    it also tries to umount path itself */
@@ -717,6 +719,7 @@ static int handle_packet(struct autofs_p
 	return -1;
 }
 
+
 static void become_daemon(unsigned foreground)
 {
 	FILE *pidfp;
@@ -1278,7 +1281,7 @@ static void usage(void)
 		"	-t --timeout n	auto-unmount in n seconds (0-disable)\n"
 		"	-v --verbose	be verbose\n"
 		"	-d --debug	log debuging info\n"
-		/*"	-f --foreground do not fork into background\n" */
+		"	-f --foreground do not fork into background\n"
 		"	-V --version	print version and exit\n"
 		, program);
 }
diff -d -urpN autofs-5.0.0_beta1/daemon/direct.c autofs-5.0.0_beta1-fg/daemon/direct.c
--- autofs-5.0.0_beta1/daemon/direct.c	2006-05-02 08:37:35.000000000 +0100
+++ autofs-5.0.0_beta1-fg/daemon/direct.c	2007-09-26 10:24:17.000000000 +0100
@@ -213,7 +213,8 @@ int umount_autofs_direct(struct autofs_p
 static int unlink_mount_tree(struct list_head *list, const char *mount)
 {
 	struct list_head *p;
-	int rv, ret, need_umount;
+	int rv, ret;
+/*	int need_umount; */
 	pid_t pgrp = getpgrp();
 	char spgrp[10];
 /*

[-- Attachment #3: Type: text/plain, Size: 140 bytes --]

_______________________________________________
autofs mailing list
autofs@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/autofs

             reply	other threads:[~2007-09-26  9:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-26  9:48 Denys Vlasenko [this message]
2007-09-26  9:51 ` [PATCH] 5.0.0_beta1: add "-s --stderr" option Denys Vlasenko
2007-09-26 15:08 ` [PATCH] 5.0.0_beta1: uncomment "-f --foreground..." help text; comment out unused stuff Ian Kent

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200709261048.48044.vda.linux@googlemail.com \
    --to=vda.linux@googlemail.com \
    --cc=autofs@linux.kernel.org \
    --cc=raven@themaw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.