From patchwork Mon Jun 17 16:03:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?6LCi6Ie06YKmIChYSUUgWmhpYmFuZyk=?= X-Patchwork-Id: 1948695 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=IQGBxHaX; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=qq.com header.i=@qq.com header.a=rsa-sha256 header.s=s201512 header.b=bqk2KuED; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W2vrN2ggQz20Ws for ; Tue, 18 Jun 2024 02:06:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Date:Subject:Cc:To:From: Message-ID: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=V2bjqKqvAciqZXioPnMRmwV14lX0rYMRH76jAxMiVnQ=; b=IQGBxHaXGUWFe1 BLIOG2Yy9SF0RK7VOamIFDXibAuCc+HfH2lKEslj/sfEoOf8AKuh38L65i6JKy5Wm/YuQxZ8Rfizs ubqwXnSpl6WPCQL40ULSuSALs04jpw/nId6mh89LW1QVzP392gXZfItbAdbzJ/wrJmwlppYwvfR+R Vj+s67k/W33twitp+s2VbTFUI4fjh+VgLtWX+MN+Je9OhIAo2962LWzUOcNyH8L5Uc4XeBQ5Gc4Wt /AjyR+kq2JMrtpfHq/D4t8QzdpqrthjDn6fycIfyg+DibNlJ1gNsCPEYmzYmrdutiquWRhgJ7TJAQ 2XUuxUfYnb1aslpkPF8A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJEpu-0000000Be0L-0x2S; Mon, 17 Jun 2024 16:04:02 +0000 Received: from out162-62-58-211.mail.qq.com ([162.62.58.211]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJEpo-0000000Bdvr-1ANH for openwrt-devel@lists.openwrt.org; Mon, 17 Jun 2024 16:03:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1718640226; bh=ULyvQ608kxUKxE1McfbBhmbEsjfZbKm9DlD8L8wTaBw=; h=From:To:Cc:Subject:Date; b=bqk2KuEDtnhgEwZpIu9EEjhugtoVhRZqRRxrtZDEmli0UbPxdMAGljEPklE4gBTEn 6xudHinMGXNINWUUcHOqrsQ9p+r8sRLTMQLrhYyKNvN1T8+Y4Rjn4v5NmboXPdbtfX aU/eaoOJmlpfCfD59CBj+axKBh/7cnb6h+Efjt6Y= Received: from mail.red54.com ([2a09:bac5:80ca:18be::277:37]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id E7316B2; Tue, 18 Jun 2024 00:03:39 +0800 X-QQ-mid: xmsmtpt1718640219tdag2b6ai Message-ID: X-QQ-XMAILINFO: NQzH8pzEc5hGbv3vV96nS7jiCwMnb5Mx2yvUZSmdRUAXNEj0gNOrxmBEZGFyEX whD8P8j924Y9+VzKfUv98+M/RtFWq5QLXlliUWoxGhOp4iqTsgXoZQiexEiEMUK+C8mOKiqL236v VfsZcEWlLFF5Qr7XNaEaQTX8QQdZ7PO9QKj19f65eD77Q5j2Mprq26uAGSSbnS6gr8pAsoYFPCIf kdltoIUAW/sJyywkR5pBCaxSnYFc5dnPjudhTUxXhTVZZPAgDyj7VyZJ4kbWK2jRskqyERjzqO1Q 2vuocSyHs59NGWl47HrAqY0q5ZpCetJT59mePONJTS3ke6L0d+y5LY0fFTHua1rqX2VuI+z9T+o2 gGS3edlU82ONQmGnddJm0Bt0QSxL9vqCiA1bPpoeP3rb6+1jJztwHGMdUj4Pdwej61GHof3FwuZR 0Pi1EiTxnBZ44tgcb0FNpiEhrjyPJL/+MAvPAyY6SicygriCeyD6l4xyCLkoxVnATxBOH7de0Tkw sbaEk8pyyQ3pJ9nZRCuiWxhuCKsTYaoQeqOhKn64jaEn3qXe8x2THehE01jMn2l3Aw6WIfOu/1Km EgHEKtP3pSo4ZnuIGtmTO02+FRMcy4dpw3v6t9wdSagt6cth/A2tz2tZQ/CqCmTf6vZ//3OAo2+e 4zBaivIpjZbsfEyMD77zvAWsLwB7uNy/B3PKoRxh3RaPTbGgvrUCa7/jMZJipNebQvd4GXX+1xRK FFvDXMnMoYM0W22htMd/nOut16rNy7jbeTPCp76lWyrtdFGfksxMNx1Jdk42MAoKZBXjSEgne9mS mVIpCjU/ntdaUV/u8zrNeg7Eu7YO+uZp/VVFsdAMTdY0vYGx58tUChK8a2gkK7AvMB1Ep/mG0htl MQCHLLLYVKtLxTlkleweNrqPm+Ly69WFtuo7/FpQCpgRazQmxSgEMqaHcg59BzM/EpTZWCDh/vYe rlP9tVnB7vpW52bD0VZvd6E8XzU+ubS4Ky3TjxiDp7iVPkg41BYofOMqnN7g+8ziwUIafDlbwofn Rjc85zK6xQMdTZaXA40JQSzlM5odNO76mg1iaEhNQkl8+SiQc+yF+cYcTGY8Q= X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: =?utf-8?b?6LCi6Ie06YKmIChYSUUgWmhpYmFuZyk=?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?6LCi6Ie06YKmIChYSUUgWmhpYmFuZyk=?= Subject: [PATCH fstools] libfstools: partname: drop parent_dev Date: Mon, 17 Jun 2024 16:03:27 +0000 X-OQ-MSGID: <20240617160327.405973-1-Yeking@Red54.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240617_090357_053966_152A73EB X-CRM114-Status: UNSURE ( 8.50 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 3.6 (+++) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__Using_parent=5Fdev_will_cause_use=5Ff2?= =?unknown-8bit?q?fs=28=29_to_make_wrong_detection=2E?= =?unknown-8bit?b?IFNpZ25lZC1vZmYtYnk6IOiwouiHtOmCpiAoWElFIFpoaWJhbmcpIDxZ?= =?unknown-8bit?b?ZWtpbmdAUmVkNTQuY29tPiAtLS0gUmVzZW5kIGVtYWls?= =?unknown-8bit?q?_due_to_DMARC_issue=2E_libfstools/partname=2Ec_=7C_15_+_1_f?= =?unknown-8bit?q?ile_changed=2C_1_insertion=28+=29=2C?= =?unknown-8bit?q?_14_deletions=28-=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=283=2E6_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?q?_=5B162=2E62=2E58=2E211_listed_in_list=2Ednswl=2Eorg=5D?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_0=2E4_RDNS=5FDYNAMIC___________Delivered_to_internal_netwo?= =?unknown-8bit?q?rk_by_host_with?= =?unknown-8bit?q?_dynamic-looking_rDNS?= =?unknown-8bit?q?_-0=2E0_T=5FSCC=5FBODY=5FTEXT=5FLINE___No_description_avail?= =?unknown-8bit?q?able=2E?= =?unknown-8bit?q?_3=2E2_HELO=5FDYNAMIC=5FIPADDR____Relay_HELO=27d_using_susp?= =?unknown-8bit?q?icious_hostname_=28IP_addr?= =?unknown-8bit?b?IDEp?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Using parent_dev will cause use_f2fs() to make wrong detection. Signed-off-by: 谢致邦 (XIE Zhibang) --- Resend email due to DMARC issue. libfstools/partname.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libfstools/partname.c b/libfstools/partname.c index 9f2347a..a950efe 100644 --- a/libfstools/partname.c +++ b/libfstools/partname.c @@ -15,11 +15,6 @@ struct partname_volume { char devpathstr[16]; struct devpath devpath; } dev; - - union { - char devpathstr[16]; - struct devpath devpath; - } parent_dev; }; static struct driver partname_driver; @@ -56,7 +51,7 @@ static int partname_volume_init(struct volume *v) v->size = volsize << 9; /* size is returned in sectors of 512 bytes */ v->blk = p->dev.devpathstr; - return block_volume_format(v, 0, p->parent_dev.devpathstr); + return block_volume_format(v, 0, p->dev.devpathstr); } /* adapted from procd/utils.c -> should go to libubox */ @@ -182,14 +177,6 @@ static struct volume *partname_volume_find(char *name) strncpy(p->dev.devpath.device, devname, sizeof(p->dev.devpath.device) - 1); p->dev.devpath.device[sizeof(p->dev.devpath.device)-1] = '\0'; - memcpy(p->parent_dev.devpath.prefix, "/dev/", sizeof(p->parent_dev.devpath.prefix)); - if (rootdev) - strncpy(p->parent_dev.devpath.device, rootdev, sizeof(p->parent_dev.devpath.device) - 1); - else - strncpy(p->parent_dev.devpath.device, rootdevname(devname), sizeof(p->parent_dev.devpath.device) - 1); - - p->parent_dev.devpath.device[sizeof(p->parent_dev.devpath.device)-1] = '\0'; - p->v.drv = &partname_driver; p->v.blk = p->dev.devpathstr; p->v.name = name;