Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B53DC433EF for ; Wed, 3 Nov 2021 10:08:06 +0000 (UTC) Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1745D60200 for ; Wed, 3 Nov 2021 10:08:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1745D60200 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=uniontech.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux.it Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 6ED483C72A7 for ; Wed, 3 Nov 2021 11:08:04 +0100 (CET) Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id AA3BB3C71C7 for ; Wed, 3 Nov 2021 11:07:47 +0100 (CET) Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 7F89E1A00E23 for ; Wed, 3 Nov 2021 11:07:45 +0100 (CET) X-QQ-mid: bizesmtp32t1635934059txr3jvqn Received: from localhost.localdomain (unknown [58.240.82.166]) by esmtp6.qq.com (ESMTP) with id ; Wed, 03 Nov 2021 18:07:36 +0800 (CST) X-QQ-SSF: 0140000000200040C000000A0000000 X-QQ-FEAT: FCUjxTjsuSIfcr+2XNXBIQCBMjSECzRsA4ko796OMSiU3p5Tp/zi6DqO18KOP mBzeyvMY+++Xvs5LZWsavRTjy0p4L5BtsoWwoAFKHz5QUjHkOumNCS8f9WTuTLvkQo66RHd QKHteKuAHlRACJ1HwjV8hw+diyIXL9B0ZlTfxVH5wnpPdhlkSb3+caRI4voehLJG6xLz0j4 Z7/UcOtz91BsQAyn28QpRdH3Wnq5M6zX9JGAFPZ+P4mQRWcnnVsRUhLbkJpYEThP+R5ZuYI dDzLpyhYTJru0u4HKSWl2lieqIu3k5xmVAIqsj2gbuFifYONjebYnKxLkXW/yRoFOr9zGF8 RvuSWbR7ieOi8xbjpS4zqaxAPcMzZSR8pxvbZdu X-QQ-GoodBg: 2 From: tangmeng To: ltp@lists.linux.it Date: Wed, 3 Nov 2021 18:07:26 +0800 Message-Id: <20211103100726.16220-2-tangmeng@uniontech.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211103100726.16220-1-tangmeng@uniontech.com> References: <20211103100726.16220-1-tangmeng@uniontech.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 X-Virus-Scanned: clamav-milter 0.102.4 at in-3.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v333 2/2] link/link05: Convert to new API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tangmeng Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" Signed-off-by: tangmeng --- testcases/kernel/syscalls/link/link05.c | 159 ++++++------------------ 1 file changed, 37 insertions(+), 122 deletions(-) diff --git a/testcases/kernel/syscalls/link/link05.c b/testcases/kernel/syscalls/link/link05.c index 5981ae62f..28d6079f5 100644 --- a/testcases/kernel/syscalls/link/link05.c +++ b/testcases/kernel/syscalls/link/link05.c @@ -1,161 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. * AUTHOR : Richard Logan * CO-PILOT : William Roske * Copyright (c) 2014 Cyril Hrubis - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Further, this software is distributed without any warranty that it is - * free of the rightful claim of any third person regarding infringement - * or the like. Any license provided herein, whether implied or - * otherwise, applies only to this software file. Patent licenses, if - * any, provided herein do not apply to combinations of this program with - * other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * - * http://oss.sgi.com/projects/GenInfo/NoticeExplan/ */ /* * Test if link(2) fails with EMLINK. */ -#include -#include +#include #include -#include -#include -#include -#include "test.h" -#include "safe_macros.h" - -static void setup(void); -static void cleanup(void); -static void help(void); - -char *TCID = "link05"; -int TST_TOTAL = 1; +#include "tst_test.h" #define BASENAME "lkfile" static char fname[255]; -static char *links_arg; - -option_t options[] = { - {"N:", NULL, &links_arg}, - {NULL, NULL, NULL} -}; - static int nlinks = 1000; -int main(int ac, char **av) +static void verify_link(void) { - int lc; struct stat fbuf, lbuf; int cnt; char lname[255]; - tst_parse_opts(ac, av, options, &help); - - if (links_arg) { - nlinks = atoi(links_arg); - - if (nlinks == 0) { - tst_brkm(TBROK, NULL, - "nlinks is not a positive number"); - } + for (cnt = 1; cnt < nlinks; cnt++) { + sprintf(lname, "%s%d", fname, cnt); + TST_EXP_PASS(link(fname, lname), "link(%s, %s)", fname, lname); } - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - for (cnt = 1; cnt < nlinks; cnt++) { - sprintf(lname, "%s%d", fname, cnt); - TEST(link(fname, lname)); - - if (TEST_RETURN == -1) { - tst_resm(TFAIL, - "link(%s, %s) Failed, errno=%d : %s", - fname, lname, TEST_ERRNO, - strerror(TEST_ERRNO)); - } - } - - SAFE_STAT(cleanup, fname, &fbuf); + SAFE_STAT(fname, &fbuf); - for (cnt = 1; cnt < nlinks; cnt++) { - sprintf(lname, "%s%d", fname, cnt); + for (cnt = 1; cnt < nlinks; cnt++) { + sprintf(lname, "%s%d", fname, cnt); - SAFE_STAT(cleanup, lname, &lbuf); - if (fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 || - (fbuf.st_nlink != lbuf.st_nlink)) { + SAFE_STAT(lname, &lbuf); + if (fbuf.st_nlink <= 1 || lbuf.st_nlink <= 1 || + (fbuf.st_nlink != lbuf.st_nlink)) { - tst_resm(TFAIL, - "link(%s, %s[1-%d]) ret %ld for %d " - "files, stat values do not match %d %d", - fname, fname, nlinks, - TEST_RETURN, nlinks, - (int)fbuf.st_nlink, (int)lbuf.st_nlink); - break; - } - } - if (cnt >= nlinks) { - tst_resm(TPASS, - "link(%s, %s[1-%d]) ret %ld for %d files, " - "stat linkcounts match %d", - fname, fname, nlinks, TEST_RETURN, - nlinks, (int)fbuf.st_nlink); - } - - for (cnt = 1; cnt < nlinks; cnt++) { - sprintf(lname, "%s%d", fname, cnt); - SAFE_UNLINK(cleanup, lname); + tst_res(TFAIL, + "link(%s, %s[1-%d]) ret %ld for %d " + "files, stat values do not match %d %d", + fname, fname, nlinks, + TST_RET, nlinks, + (int)fbuf.st_nlink, (int)lbuf.st_nlink); + break; } } + if (cnt >= nlinks) { + tst_res(TPASS, + "link(%s, %s[1-%d]) ret %ld for %d files, " + "stat linkcounts match %d", + fname, fname, nlinks, TST_RET, + nlinks, (int)fbuf.st_nlink); + } - cleanup(); - tst_exit(); -} - -static void help(void) -{ - printf(" -N #links : create #links hard links every iteration\n"); + for (cnt = 1; cnt < nlinks; cnt++) { + sprintf(lname, "%s%d", fname, cnt); + SAFE_UNLINK(lname); + } } static void setup(void) { - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; - - tst_tmpdir(); - sprintf(fname, "%s_%d", BASENAME, getpid()); - SAFE_TOUCH(cleanup, fname, 0700, NULL); + SAFE_TOUCH(fname, 0700, NULL); } -static void cleanup(void) -{ - tst_rmdir(); -} +static struct tst_test test = { + .test_all = verify_link, + .setup = setup, + .needs_tmpdir = 1, +}; -- 2.20.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp