From nobody Fri Dec 09 12:17:44 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NT95N6gw6z4kPhp; Fri, 9 Dec 2022 12:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NT95N3xGJz3r99; Fri, 9 Dec 2022 12:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xYyvMcqfbXPIrp89ikJ8cI2H63povnuMbLETwid3cBo=; b=IyDfDeVIor2/lsX5nqVkrOdu9FPNfhalwz9KKbkJIePdp5p92l7uG/kCuHx+zoW7+aa2tY AcBKW2B+4SmuaHTMAckNJ8i3pYoMwPFPvTWl/iqa7H6H0jKCS1+WPWVfExpsemKNmAUZFg tBCgSLvU1Y9K9w8gU9ObIq5duHBGoIu5QhyUqabah8MukgGX/jdFRDsWIVKeXYoQyL6JZ3 1HkI4Bmj4/KwPcku9GajyL8J/vR92aAvlnDmDlELIGU9xW680AaZr+uLsYmA7BA7wjE757 EjxDBJHbsgg5riv02uIywv2B2dNFyIMIULfKA1BJuukb2clj3lT11QH6Z4qAGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670588264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xYyvMcqfbXPIrp89ikJ8cI2H63povnuMbLETwid3cBo=; b=Idtnc3zYHeY2ErZcd8Y+oNNiqPStjiq+N3SQ+cNDyjRwR90lEd30SrxqEYiWgTyzhkFfNT tjFK8vuzho3c0P4blX1v6OBoUbU4tncv8rKc9fZQeiWnT0AjZb9flm6kmiWXLssJR5+nEo /SxsbFpK78BiWr/EjAqayaubUn3CgTrh4kFWco+42AobF5WDsj3jfEWhqxvvqoKNhqAcXX OkGR2vxdlcte5908Fwr3dxvKHcmjQeVfJ3J7Q4sd226jPJXUK4/g3Stsw/V+o/ADfHW/So 76Zvp6uJtkgMb96x3lxHp2YTpp5gZjKnEXqq+SUh2JHmcbhy+W2oqgmfsnD6VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670588264; a=rsa-sha256; cv=none; b=YZuOjKbEGddHNY0Og0A8OjMgP82jQ67KUITZ9iKPXN52FUJV6/G10h+sifI54u81F/jtdX aPdmpwn/JknQzPJaFjXZdxFcvoDO3MwellnBpx2pTADgChyMCZ6vRPkRht+5dH7pDFXmu/ jvGqF2nXFATAcniYBrHwCGFu0SAH69mgpOnJ5S0+C28MFHtaqhU06mRr29791M9qPwus8k 9In0esam7qEJR/Pl/ppvYsQAx5VqdmykrkdMFc+zZJw4bR2lWFPK1D0wKuMP2uNiAS9/Ma v/kR9vpYC1LSMfrWjC1pdqfLU30X5ztbfBdRjyKHe7THbPxa+2+nbhSddip++w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NT95N31tTzbZK; Fri, 9 Dec 2022 12:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B9CHiM8086565; Fri, 9 Dec 2022 12:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B9CHixh086564; Fri, 9 Dec 2022 12:17:44 GMT (envelope-from git) Date: Fri, 9 Dec 2022 12:17:44 GMT Message-Id: <202212091217.2B9CHixh086564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f1f030246f3e - main - posixshm_test: small style fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1f030246f3e72af0ee3ba82a0e8b9f6d9559b69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f1f030246f3e72af0ee3ba82a0e8b9f6d9559b69 commit f1f030246f3e72af0ee3ba82a0e8b9f6d9559b69 Author: Konstantin Belousov AuthorDate: 2022-12-03 22:54:13 +0000 Commit: Konstantin Belousov CommitDate: 2022-12-09 12:17:12 +0000 posixshm_test: small style fixes Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D37097 --- tests/sys/posixshm/posixshm_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/posixshm/posixshm_test.c b/tests/sys/posixshm/posixshm_test.c index 6398f5f6e085..add22c330b4e 100644 --- a/tests/sys/posixshm/posixshm_test.c +++ b/tests/sys/posixshm/posixshm_test.c @@ -1081,7 +1081,7 @@ ATF_TC_BODY(fallocate, tc) ATF_REQUIRE_MSG((error = posix_fallocate(fd, sz, sz)) == 0, "posix_fallocate failed; error=%d", error); ATF_REQUIRE(fstat(fd, &st) == 0); - ATF_REQUIRE(st.st_size == (sz * 2)); + ATF_REQUIRE(st.st_size == sz * 2); close(fd); } @@ -1097,7 +1097,7 @@ ATF_TC_BODY(fspacectl, tc) page_size = getpagesize(); shm_sz = shm_max_pages * page_size; - fd = shm_open("/testtest", O_RDWR|O_CREAT, 0666); + fd = shm_open("/testtest", O_RDWR | O_CREAT, 0666); ATF_REQUIRE_MSG(fd >= 0, "shm_open failed; errno:%d", errno); ATF_REQUIRE_MSG((error = posix_fallocate(fd, 0, shm_sz)) == 0, "posix_fallocate failed; error=%d", error); @@ -1115,7 +1115,7 @@ ATF_TC_BODY(fspacectl, tc) /* Unaligned fspacectl(fd, SPACECTL_DEALLOC, ...) */ ATF_REQUIRE(shm_fill(fd, 0, shm_sz) == 0); range.r_offset = offset = page_size / 2; - range.r_len = length = ((shm_max_pages - 1) * page_size) + + range.r_len = length = (shm_max_pages - 1) * page_size + (page_size / 2) - offset; ATF_CHECK_MSG(fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == 0, "Unaligned fspacectl failed; errno=%d", errno); @@ -1143,7 +1143,7 @@ ATF_TC_BODY(fspacectl, tc) /* Aligned fspacectl(fd, SPACECTL_DEALLOC, ...) past shm_sz */ ATF_REQUIRE(shm_fill(fd, 0, shm_sz) == 0); range.r_offset = offset = page_size; - range.r_len = length = ((shm_max_pages + 1) * page_size) - offset; + range.r_len = length = (shm_max_pages + 1) * page_size - offset; ATF_CHECK_MSG(fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == 0, "Aligned fspacectl past shm_sz failed; errno=%d", errno); ATF_CHECK_MSG(check_content_dealloc(fd, offset, length, shm_sz) == 0, @@ -1152,7 +1152,7 @@ ATF_TC_BODY(fspacectl, tc) /* Unaligned fspacectl(fd, SPACECTL_DEALLOC, ...) past shm_sz */ ATF_REQUIRE(shm_fill(fd, 0, shm_sz) == 0); range.r_offset = offset = page_size / 2; - range.r_len = length = ((shm_max_pages + 1) * page_size) - offset; + range.r_len = length = (shm_max_pages + 1) * page_size - offset; ATF_CHECK_MSG(fspacectl(fd, SPACECTL_DEALLOC, &range, 0, &range) == 0, "Unaligned fspacectl past shm_sz failed; errno=%d", errno); ATF_CHECK_MSG(check_content_dealloc(fd, offset, length, shm_sz) == 0,