From patchwork Wed Dec 12 14:24:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1012031 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ExEb9kk/"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WcF+yk9l"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43FJxZ6fj7z9s2P for ; Thu, 13 Dec 2018 01:25:21 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=T9e52hZxGjVD6U9ePDVhkvgnVMOmjKJ7omvX7mfAIvk=; b=ExEb9kk/euCMDK uyghy6g0Wfk4o1JmT10KRNLs0LYSoBBsITSqTXhP0VlDCXsl8w35PI6WxM7/vasMgC+jXJvKAQTSn UBC2tY3tpK0Cgzsc+8+wDAdNrNcTvGVPevxT7AISVcBjbp8q2updv1ifgqvoTb42DDRVI4jpsZ2e2 xBSiSlzWb0PCG4j5DXvZRJJyQD7gxow2Qimm3RT1/CK5w1l35NiQ8R/L0k/oz4z/jRuj6hVSjyx0r lZNgaIdxRx+zz+QKm6tovrFVe2Nu8TMHOilGEa9oHl1x149mfKQS/ysMUflVBWL9pUMdomV2uEVZk PYOial8Vpk+sTyeZLgwA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gX5Rm-000293-Gg; Wed, 12 Dec 2018 14:25:10 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gX5Re-0000pD-PT for openwrt-devel@lists.openwrt.org; Wed, 12 Dec 2018 14:25:08 +0000 Received: by mail-lf1-x141.google.com with SMTP id z13so13641973lfe.11 for ; Wed, 12 Dec 2018 06:24:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rD0y0xtNDT8TLSyVgoay0U8REfR2LYRdYtgdaLJulgc=; b=WcF+yk9lKhBg5NOa8pgSTZz6r1JDwFto5d/Lrt72jHnD5e4q0vLXrnRsxlsHCC7+Ak gbxkKqTyaSlrYpBZMh6ZALoRq7OPlppkxA9QloA8cBCLcaR0UEWoWJpjMsIUTGA9EM9D dcDJaANf+8KtlHjKdgSae1xKZvsN4v6geEZGVtRmLAZl0K9R54lYuAuVsCKEIJuElFUI eXhj2qWrMu5j8fE5vTPTJioyEJTAq03+ONSscKkdJadTFsfjuKS14E0Z82lO04vZofan xKnNI0b78Aek1WLQx0SYRe7pqoY8XBMO2K/qFTggdfErXHqF5JMYUKxH6zsqM+efdEI2 z7JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rD0y0xtNDT8TLSyVgoay0U8REfR2LYRdYtgdaLJulgc=; b=DM1oWgIOWIGoChxXmd7RrThHvNxPiiMgYUTo4hRcuXvJDjcsHthy+fgCey2Ia9u1cp AsvI4Xg7MPZdscObJy0kxtwWx2cGFs6TRAGoO5krFwwKzji45N4L49i4K3DnoMnOk4ai +M81qankIjAKURpySS9nGkhGgkIF46936/kkIXlXBF8wsPGQPR/tB5jnoo3bTK7AYstK QAM0OpIognOpFRGrFx57P+txvJKzUj78qzYHE7FZao2Md4iOYQtwRlhyN6pVtG7Wm7Mb JJTt/wuINCIV0cifOvfrG+tlJ59PG5FjW+dqpd6J4vyVxSBMszmRo9F0ORE9EVfn7Nz7 13Lg== X-Gm-Message-State: AA+aEWahPd9dmSMo+UV1C9S09BU646aA8MhiXg+2frkfdgCsoDwAEPck 5ptB7WjGUhOxROH/bPssaGFkKSqh X-Google-Smtp-Source: AFSGD/UrTdX6QccbjO0m5QwlyFBtfHe4tPsL9MU6cvrebuwo46JTBYrXzQ/vzeMNcizSmrnnMCwlrA== X-Received: by 2002:a19:4402:: with SMTP id r2mr1909313lfa.111.1544624690450; Wed, 12 Dec 2018 06:24:50 -0800 (PST) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id h22-v6sm3266731ljg.24.2018.12.12.06.24.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Dec 2018 06:24:49 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Date: Wed, 12 Dec 2018 15:24:34 +0100 Message-Id: <20181212142435.6495-1-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181212_062502_845835_BA6C0008 X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:141 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH 1/2] blockd: unmount device explicitly when it disappears X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki To keep autofs behavior consistent blockd should request both: mounting and unmounting when needed. It's important as autofs-related actions may require slightly different handling. Without this patch: 1) autofs mounts were handled using TYPE_AUTOFS 2) autofs unmounts were handled using TYPE_HOTPLUG Signed-off-by: Rafał Miłecki --- blockd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/blockd.c b/blockd.c index 29d16f2..a00a5b3 100644 --- a/blockd.c +++ b/blockd.c @@ -111,8 +111,19 @@ block(char *cmd, char *action, char *device) static void device_free(struct device *device) { - if (device->autofs && device->target) + char *mp; + + if (!device->autofs) + return; + + if (device->target) unlink(device->target); + + mp = _find_mount_point(device->name); + if (mp) { + block("autofs", "remove", device->name); + free(mp); + } } static void