From patchwork Fri Feb 9 16:18:21 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: 871468 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=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BsObV9qv"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QkAYPrFG"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3zdKxl2Bb5z9s7g for ; Sat, 10 Feb 2018 03:18:51 +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:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fWZBhKqLjpx6cUjgjtG0WPpibwJENb2PCjTwSIxVDMs=; b=BsObV9qvdIuejd e4kk1TlhA4X2qGWY7YKytOYWOylIJEliiytkuKNeGHg46Uw82CHI8bO6Qa/kN2+FWh97rJRhSs+sz UVZmXT5Dqb0hd0Q2NtSTbpPvuVN6YaVdB2jDN/3whYnMDYt70z+LSQ+SrxRm9hvCfL/IS/IiVPunQ hkV1277POk9OaPCfhM4TqM8Fndgyf3l95F77eIPB4prPZRE9VpN527iLFzmwFTatRzvzDxEoNWRwR tq5MHjETy5xsmscpbVHmhfJ3P/VgMY6c2+jaPhx8exLp7eNpXUtEFGQWLwmZfu4F7DfBqikfWiDam m4XiiHWcI7/ZYFiWZGDw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ekBNv-0003Y5-IL; Fri, 09 Feb 2018 16:18:47 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ekBNs-0003Wx-Up for lede-dev@lists.infradead.org; Fri, 09 Feb 2018 16:18:46 +0000 Received: by mail-lf0-x244.google.com with SMTP id h78so4776428lfg.6 for ; Fri, 09 Feb 2018 08:18:37 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=wujuc5RR/IQFtzKJP4Z/ZUw8XfiOBe6pQBrpr3ILPhs=; b=QkAYPrFGlAcVlktuTS5ZUaM71vPmkdQWkHH/aSemPYMC3RDuuX8fKGfWJvkvaWco4L cHw1OVO6clY+iw7n7sEBCROYC7P09TOF+p+siMk0a+EpvZZwlYNVqhc2ADa7/OAaI6KR rNSZiSZJyVXnCDFjXfP3V/JJZmZwY6ZjCXT3zLJ+IOS5+RAqSV7kpVeviZS4clgDsk7a Hia+RIb/l5NPwBzU6RyyttK/t3+1cY+B/8S2Kt1ugDwc3wAAqEZVxfwAWu3yIHAKEj1X PvFWf/rLQREneKo8qVhf5UR3Im4dhx+MzjDwgvvue59Hd13aSkP1Kr41BRqUfZHg65Dn aMfg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=wujuc5RR/IQFtzKJP4Z/ZUw8XfiOBe6pQBrpr3ILPhs=; b=owQDbzRriA97PIEAdKcXAGGqh4iEETZwYBtquADdS2qd/2NomSc6NXGxyJr4yIlmqt v5PX45Wj0JVQEoxUQtwUIgwOeHa9GTcSdkftSMfz/KROgwEY4lHUAi+WicIX60ZkG3LE Jd/yoyKdMQ58cABE5U4cnz6FJNqP57x4Mt7hMpbsqazJAjPmDdeCcMxJzINtWM1kvmWw qgkMEpRufkR2bWHefgLFIu3MbK5c2vvQNmV3AJEhaLY9tQsqGiKgubuUCM2HtaOHaMCf NeVOgsgZuVOZ4YKC21sPRLjUIQ9RU26qER7IfSU7cBrnHtn8IgBtDG1xmuzkhygUYSIs 4lvg== X-Gm-Message-State: APf1xPCW6pgTsi+iOVbAjRHGhzhaXoFSlFeL41AqgDT8MmHH9xjFc6ps 1D5JAjNeTtIlkAfFliAQrWI= X-Google-Smtp-Source: AH8x225dz9eDxJVEHtM84A5az8V7ANOJK/H3HcYtGb+OnNAZiyn9IIB9qEu2VIQSd1BeDQ7BexCmQw== X-Received: by 10.46.91.80 with SMTP id p77mr325024ljb.122.1518193115612; Fri, 09 Feb 2018 08:18:35 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id u13sm477396ljd.64.2018.02.09.08.18.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 08:18:34 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: John Crispin , lede-dev@lists.infradead.org Date: Fri, 9 Feb 2018 17:18:21 +0100 Message-Id: <20180209161821.21590-2-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180209161821.21590-1-zajec5@gmail.com> References: <20180209161821.21590-1-zajec5@gmail.com> MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4010:c07:0:0:0:244 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) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH mountd 2/2] mount: fix removing mount point if it's expired X-BeenThere: lede-dev@lists.infradead.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: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Rafał Miłecki Kernel can report mount point as expired and when that happens mountd unmounts it. It's still important to: 1) Cleanup directories 2) Call hotplug scripts when device for such a mount disappears. Fix this by adding a new EXPIRED status and checking it when block device disappears. Signed-off-by: Rafał Miłecki --- mount.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mount.c b/mount.c index 2d34a91..cb3e03c 100644 --- a/mount.c +++ b/mount.c @@ -38,11 +38,13 @@ static struct list_head mounts; * * @STATUS_UNMOUNTED: currently not mounted * @STATUS_MOUNTED: mounted & ready for usage + * @STATUS_EXPIRED: mount expired & *temporary* unmounted * @STATUS_IGNORE: entry should be ignored and never mounted */ enum status { STATUS_UNMOUNTED = 0, STATUS_MOUNTED, + STATUS_EXPIRED, STATUS_IGNORE, }; @@ -330,7 +332,7 @@ int mount_remove(char *path, char *dev) rmdir(tmp); mount = mount_find(0, dev); if(mount) - mount->status = STATUS_UNMOUNTED; + mount->status = STATUS_EXPIRED; log_printf("finished unmounting\n"); mount_dump_uci_state(); return 0; @@ -762,7 +764,7 @@ static void mount_enum_drives(void) p->next->prev = p->prev; p = p->next; log_printf("removing %s\n", q->dev); - if (q->status == STATUS_MOUNTED) { + if (q->status == STATUS_MOUNTED || q->status == STATUS_EXPIRED) { snprintf(tmp, 64, "%s%s", "/tmp/run/mountd/", q->dev); rmdir(tmp); snprintf(tmp, 64, "%s%s", uci_path, q->name);