From patchwork Wed Jul 15 13:59:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1329563 X-Patchwork-Delegate: rsalvaterra@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Z13q3swi; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Wl72dswY; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6Jv95fBYz9sTQ for ; Thu, 16 Jul 2020 00:00:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=u63DwHkVaXxCj0e4PEjik1EJ2MkECQ41PK5Isl5doB4=; b=Z13q3swiq8p2fc3XJG2m/skIMm DCxk1X8Glw340nduxk8+mW3/QGVnxDux/TWYAUkA9F99gpFvFrviUah9x7buuA9QhMhTjtgpVzu80 EwERw/eqEMVEumwxdUPZKQb89/KGAa2wfcUaDZ08MKmlodJMTF3jYJp3JPYn4NYQ30mCdBRVeEtNB ow8SvbDZaY/YO2XL2KtvpR0KuU0zvpmz9L99ua9A3yfp/AymLf66+vFLd+Y0Z//zuhy1CsthA99xH up0sN8JPPv3jXc1stEqQAmFzRjGlQL029uSS35gm9s9fejoxdcq5ZmsX/lICWe/y/8hssdh0uE0qO K9F7xbsw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvhwp-0006cs-5x; Wed, 15 Jul 2020 13:59:47 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvhwm-0006cH-PX for openwrt-devel@lists.openwrt.org; Wed, 15 Jul 2020 13:59:45 +0000 Received: by mail-pg1-x541.google.com with SMTP id w2so3111932pgg.10 for ; Wed, 15 Jul 2020 06:59:44 -0700 (PDT) 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=8pnCMl8v6zXqPIlQe0czbTgVxcxdnB1WFxL9Oz2ax1Q=; b=Wl72dswYXcx0zyPFNcpAMQ45s7dUotwBAq91KVVBq3X1q2a10kUZNKjf3onjyqtc7l mgThfdRSn5p2OqdeyMv5EDYwTSOhCMniACarXNxUqJWPQgixjuJL6bMacRARmQ5Tl2B4 4TNntqZqE0Mc1jyVSBj/JicQYPNKcIL5Lm/CI0iLnqP9/3/zYcZU8aEiLQxddXCf1HnQ 7OTdAfN3CuBk6Pxnju4S2P82pLgfjBvHMrEOyD0H9e+vrUPwGoE8MUpYCCg2SrACjwOm v+yE7rqHsSaC9K3uz/C3KHzH1d+WJyL7IFoZ8DR8Rq77+H1rJOI9W1v3XmhtS9eAPOLF N8EA== 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=8pnCMl8v6zXqPIlQe0czbTgVxcxdnB1WFxL9Oz2ax1Q=; b=dofnpsY3wpFeHDDKouEpEP0AVS2SSc1NeNt8femXxFu/9Ry1UCvYRfK4whn9VUHTs0 Wbj/rsQliPHHJU2T+cjXwony1Awwt6N6rE1ObZMjGanL6+X1dL8abzqWnskgf28wR5iN NhcgUc0M47hEUHFuy+C5YOqz9V2MQXKeGxJ4/VddgI1Frt8ozK+7eePVJcUFWdacporA qbBShuiY6jMy7sK+p/VVkn1kw20JvHihN0JPkPmfGvZTfanHObexuTWjEPOy5RHZbkZE E+CM3PVwPm8C7xBLhOVorykhJNmE6KieDTHr0eDvqBvXAbNiAwbopDUhl2sdKf01YN8o JuEg== X-Gm-Message-State: AOAM5309lFomw4EfYZYVoHSE4Emh3GQdmoQp195TgFOn6G1f73gU2DBr DQLXjFaaAjvbs6XLuq/d/TlUs7U= X-Google-Smtp-Source: ABdhPJz6fr33D7opqm3hU9u+QWU2tJlk0BP4A7IlNSYW9wXeCnUnWJ2hDQ334UNGLgqMjeJG+DxLvQ== X-Received: by 2002:a63:6fcd:: with SMTP id k196mr8561687pgc.251.1594821582188; Wed, 15 Jul 2020 06:59:42 -0700 (PDT) Received: from presler.lan (a109-49-8-134.cpe.netcabo.pt. [109.49.8.134]) by smtp.gmail.com with ESMTPSA id y17sm2274051pfe.30.2020.07.15.06.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 06:59:41 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Subject: [PATCH] fstools: block: remove the swapon/swapoff applets Date: Wed, 15 Jul 2020 14:59:19 +0100 Message-Id: <20200715135918.48927-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_095944_860085_2D2E5D20 X-CRM114-Status: GOOD ( 11.59 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:541 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rui Salvaterra Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The swapon/swapoff applets enabled by default in BusyBox have more features than the ones from block-mount's block app, which makes them redundant. This patch removes only those applets, while both keeping all the internal functionality required to handle hotplug/fstab swap and also shaving off a few bytes from the block executable: Before: 92724 bytes After: 89532 bytes Signed-off-by: Rui Salvaterra --- block.c | 127 -------------------------------------------------------- 1 file changed, 127 deletions(-) diff --git a/block.c b/block.c index 569bf56..ffb92d9 100644 --- a/block.c +++ b/block.c @@ -1691,127 +1691,6 @@ static int main_info(int argc, char **argv) return 0; } -static int swapon_usage(void) -{ - fprintf(stderr, "Usage: swapon [-s] [-a] [[-p pri] DEVICE]\n\n" - "\tStart swapping on [DEVICE]\n" - " -a\tStart swapping on all swap devices\n" - " -p pri\tSet priority of swap device\n" - " -s\tShow summary\n"); - return -1; -} - -static int main_swapon(int argc, char **argv) -{ - int ch; - FILE *fp; - char *lineptr; - size_t s; - struct probe_info *pr; - int flags = 0; - int pri; - struct stat st; - int err; - - while ((ch = getopt(argc, argv, "ap:s")) != -1) { - switch(ch) { - case 's': - fp = fopen("/proc/swaps", "r"); - lineptr = NULL; - - if (!fp) { - ULOG_ERR("failed to open /proc/swaps\n"); - return -1; - } - while (getline(&lineptr, &s, fp) > 0) - printf("%s", lineptr); - if (lineptr) - free(lineptr); - fclose(fp); - return 0; - case 'a': - cache_load(0); - list_for_each_entry(pr, &devices, list) { - if (strcmp(pr->type, "swap")) - continue; - if (swapon(pr->dev, 0)) - ULOG_ERR("failed to swapon %s\n", pr->dev); - } - return 0; - case 'p': - pri = atoi(optarg); - if (pri >= 0) - flags = ((pri << SWAP_FLAG_PRIO_SHIFT) & SWAP_FLAG_PRIO_MASK) | SWAP_FLAG_PREFER; - break; - default: - return swapon_usage(); - } - } - - if (optind != (argc - 1)) - return swapon_usage(); - - if (stat(argv[optind], &st) || (!S_ISBLK(st.st_mode) && !S_ISREG(st.st_mode))) { - ULOG_ERR("%s is not a block device or file\n", argv[optind]); - return -1; - } - err = swapon(argv[optind], flags); - if (err) { - ULOG_ERR("failed to swapon %s (%d)\n", argv[optind], err); - return err; - } - - return 0; -} - -static int main_swapoff(int argc, char **argv) -{ - if (argc != 2) { - ULOG_ERR("Usage: swapoff [-a] [DEVICE]\n\n" - "\tStop swapping on DEVICE\n" - " -a\tStop swapping on all swap devices\n"); - return -1; - } - - if (!strcmp(argv[1], "-a")) { - FILE *fp = fopen("/proc/swaps", "r"); - char line[256]; - - if (!fp) { - ULOG_ERR("failed to open /proc/swaps\n"); - return -1; - } - if (fgets(line, sizeof(line), fp)) - while (fgets(line, sizeof(line), fp)) { - char *end = strchr(line, ' '); - int err; - - if (!end) - continue; - *end = '\0'; - err = swapoff(line); - if (err) - ULOG_ERR("failed to swapoff %s (%d)\n", line, err); - } - fclose(fp); - } else { - struct stat s; - int err; - - if (stat(argv[1], &s) || (!S_ISBLK(s.st_mode) && !S_ISREG(s.st_mode))) { - ULOG_ERR("%s is not a block device or file\n", argv[1]); - return -1; - } - err = swapoff(argv[1]); - if (err) { - ULOG_ERR("failed to swapoff %s (%d)\n", argv[1], err); - return err; - } - } - - return 0; -} - int main(int argc, char **argv) { char *base = basename(*argv); @@ -1821,12 +1700,6 @@ int main(int argc, char **argv) ulog_open(-1, -1, "block"); ulog_threshold(LOG_NOTICE); - if (!strcmp(base, "swapon")) - return main_swapon(argc, argv); - - if (!strcmp(base, "swapoff")) - return main_swapoff(argc, argv); - if ((argc > 1) && !strcmp(base, "block")) { if (!strcmp(argv[1], "info")) return main_info(argc, argv);