From patchwork Fri Jul 7 18:34:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 117251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3477036vqx; Fri, 7 Jul 2023 12:01:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFoI/RW4bG3P1KZubX1vyYn8GvmJzunZwpz81ScNSyJIlO6O60hpCrUfSVAiwF4mpqFDW0K X-Received: by 2002:a05:6a00:2d95:b0:67f:6d90:8fb with SMTP id fb21-20020a056a002d9500b0067f6d9008fbmr15464443pfb.13.1688756495028; Fri, 07 Jul 2023 12:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688756495; cv=none; d=google.com; s=arc-20160816; b=R0dW4ftmZqTAGYULXPqGSuN6oIatB9lS7jUvWwrrUpWyaXo8v/ytiVZ0upIFOm+xJW dtCqpxBRHQSXPH0g9XQJ3soXR1xSVPhcxq4tbo0xvn+UG5Saqm+RAzjbx9iwslrnuQhG 0wylI/8vXdwxzAMqsAa6plwkz7jtfCT/J0+lDVgDOKYt27/Kk+02msOmElYsske0ACEl v2LNlrsqxxBs0sWtvd6BB65uecQEAw7XUIApK2UAf5vaK4Xl1cXLquDLWBWFOx9B48Fc tOlkjkQzQbYUIuxmYuCpZOn0VC2j31ZV9cgwunCewmunvBKDSmdlWCnJpNiqaExHZPz4 X66A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=EBT1jxzYIbKRjB7ZbmI0M4/0tWAxVNWHgNyJj7MZkpw=; fh=+UJGAEU2Zd20Ffzlyw2DOtwfBiThnaWweXJeIpZW2cQ=; b=dW3OrOBIwNqnwTc8Rc5q7nX9S1F6DbIUv5K3t49ufNFFq1gyDiZl88ncxz+lKx7SX5 tjoWySzpYWCCrZbBxKnBZmC6AHkVgRr6RTGq2Hk9QXQErlU6xFN2jPdRvv0FNOKzCQkk QzhGBBoxkjsXW5vM6RNVruTgoU64WP89UQCyW6n9EUipMAFCRgZ681yqFVxrLjT72hSP VZquAedJVemI30fTcsGqxkGswncQRL2f9MUnDSiWobdXYV30B85LV9ZO2w/S+ODPBxSg M0nixVH9ao+TIhaZVKqNd8UBtNOJOdv7Upty/7B0A/NZoBrHadIS/g9QyVth6/K6S4fG HE7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 4-20020aa79204000000b006826f17d020si3899832pfo.243.2023.07.07.12.01.19; Fri, 07 Jul 2023 12:01:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbjGGSet (ORCPT + 99 others); Fri, 7 Jul 2023 14:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232501AbjGGSeq (ORCPT ); Fri, 7 Jul 2023 14:34:46 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20E782685; Fri, 7 Jul 2023 11:34:43 -0700 (PDT) X-QQ-mid: bizesmtp67t1688754875tv67uwp3 Received: from linux-lab-host.localdomain ( [116.30.131.119]) by bizesmtp.qq.com (ESMTP) with id ; Sat, 08 Jul 2023 02:34:34 +0800 (CST) X-QQ-SSF: 01200000000000D0W000000A0000000 X-QQ-FEAT: lO87fmWkX3HpsLfCTb5+tVIiOoTKdAOMqPvXKyQaIVThl5VL9goMsQIls+Xbj kl3u0in0xHM7RNVC00ryMWbvQRHgGvwn3XpXtpN4DpADWw2EIUnWs5VZdhMrNM2Ad2hQdWK onn7iIrumRQb33g1ICrYHJOJqYlQwUuULrBTP6A5za9MXEVNQfQ2F9dkFvvYVSMAp0rcXTX ILIWuBznvTEtO6aJ3MWIyQPf+L+eODvh5sHZHL38mjvHFXIl44cFcNA2Mi3SS95AjK6p/lv PvDRYv46O7Ht0Ig5ygo5CxVKVcRVEd3wkQm0PMJKY3xI6yARcFZ5ti5OeMY1K+9hwtp5i2W ThpacGhwgfI8uHEkZhLK36wYrMogXXYqJspOsc3Ghdhg2KjCOY= X-QQ-GoodBg: 0 X-BIZMAIL-ID: 7451315100261662590 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, thomas@t-8ch.de, =?utf-8?q?Thomas_Wei?= =?utf-8?q?=C3=9Fschuh?= Subject: [PATCH v4 10/18] tools/nolibc: add rmdir() support Date: Sat, 8 Jul 2023 02:34:21 +0800 Message-Id: <3d6088e256c5b3961b433b52431f43e52f3e0634.1688750763.git.falcon@tinylab.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770789530489480637?= X-GMAIL-MSGID: =?utf-8?q?1770789530489480637?= a reverse operation of mkdir() is meaningful, add rmdir() here. required by nolibc-test to remove /proc while CONFIG_PROC_FS is not enabled. Reviewed-by: Thomas Weißschuh Signed-off-by: Zhangjin Wu --- tools/include/nolibc/sys.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 804bc0231ec7..dee56894a811 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -611,6 +611,28 @@ int mkdir(const char *path, mode_t mode) return __sysret(sys_mkdir(path, mode)); } +/* + * int rmdir(const char *path); + */ + +static __attribute__((unused)) +int sys_rmdir(const char *path) +{ +#ifdef __NR_rmdir + return my_syscall1(__NR_rmdir, path); +#elif defined(__NR_unlinkat) + return my_syscall3(__NR_unlinkat, AT_FDCWD, path, AT_REMOVEDIR); +#else + return -ENOSYS; +#endif +} + +static __attribute__((unused)) +int rmdir(const char *path) +{ + return __sysret(sys_rmdir(path)); +} + /* * int mknod(const char *path, mode_t mode, dev_t dev);