From nobody Sun Apr 16 19:45:28 2023 X-Original-To: dev-commits-src-all@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 4Q00yw49xWz45sXh; Sun, 16 Apr 2023 19:45:28 +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 4Q00yw25fSz41LW; Sun, 16 Apr 2023 19:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681674328; 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=ENFHbJs+qkjyt3R+uA5Tgky8N9E0JZklECQP9zyyu64=; b=IU+zBvwEW8FaTxy++euzck7uu9bD+QqLY5Wyz9meBlogtkL0SEphh19SaYW3WJzv//lznR u+qcqBnUnYDYZry35u1AhFb3vUUq7XFN8nGVK9ow9Ma7UrmK+a1Y6Dqk68x7Z9T4Et97bt 20QD2eroo5NdgjGduZpH4TzN2uycUg/A09aPuJy+hkpdcaBsz1EZGiqqgxR/9jCUJKxNhL sG+im7yXDJaKRYrWxhOXeUQWCLQ/Mz5m+NEzWRHdeinfFpljeb7chkl4irQw31g8ls1YQW eYtkFFtFey+m8jylzT5ywE0cleCw935vFqSJCgwwuJPucYARqJMyPXQvxMrGkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681674328; 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=ENFHbJs+qkjyt3R+uA5Tgky8N9E0JZklECQP9zyyu64=; b=AIznLjAI0wug9ZbYlB6xLruyRAVMlOHON21SvBxquakrpFxAMUmISPMzHj53rQc5SXjFUk Axs8ugz/UV/rym82AiqFJGbdeFXt4KyikdFugvOu1nmdJ6pKt7JEL4lzG2ewfQz1N3VvfP wA8Od6HJHJg8uckztmB4ILgZ25ZlNveK1JB1YbXhZUyH96nv62kRTKarc1BMBTAg+h5aEd KhA3VLHFe3r0YvtPzYRDw4wTLTolkaG+B+fJqtPT9sJROarT/A9rAHDDiIyVsgkkvOmpom Pnb3eFzQk2R54kPxQWAbl37Y0WV669QRaBJwcxxmIb4b4Kfije0hLn+BPB/eiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681674328; a=rsa-sha256; cv=none; b=Ia+tCnxQJY8PH5xQGSdO+/eCJ7ZeALw5ZtdPwx8KfxEEqX6L91pPPPlqdc2pYOKFt1Lr1q 53Xnjafm8h+5/ATISOWT7v3GqbCEBL0074JhxjF9ClZ7CmV70PrlZ/dnAVqQBTz1BkDbZ6 /zn7HeXyC0+Nu40xs0ZZJDR5+0bswfVdOlruaqbbvD0gnmXn1l7wqj+kdjdx6FMtuHoGND nPW3QqzsbG/L/2E8YJZcxFBCfn+aVVA1kXNm4Yp6Dgy3+MGuh1WKd/3jDKr8h3SXYmsDOg A8h215C5PjlG6LC78N9RBOIMae5clZOlzm+2cwDiYIHrCzqT6ikAoV7HKgOFWA== 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 4Q00yw0wwbz10X1; Sun, 16 Apr 2023 19:45:28 +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 33GJjSX5094052; Sun, 16 Apr 2023 19:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GJjSUS094051; Sun, 16 Apr 2023 19:45:28 GMT (envelope-from git) Date: Sun, 16 Apr 2023 19:45:28 GMT Message-Id: <202304161945.33GJjSUS094051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e5551216d8e5 - main - makefs: call brelse from bread List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5551216d8e563043248bc7f3cb1c75b2dbd9791 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e5551216d8e563043248bc7f3cb1c75b2dbd9791 commit e5551216d8e563043248bc7f3cb1c75b2dbd9791 Author: Ed Maste AuthorDate: 2023-03-13 21:00:20 +0000 Commit: Ed Maste CommitDate: 2023-04-16 19:45:17 +0000 makefs: call brelse from bread This matches NetBSD and rationalizes makefs with the kernel API. This reverts commit 370e009188ba90c3290b1479aa06ec98b66e140a. Reviewed by: mckusick Sponsored by: The FreeBSD Foundation Obtained from: NetBSD 0a62dad69f62, 0c4125e1a19f, cb6a5a3575fd Differential Revision: https://reviews.freebsd.org/D39070 --- usr.sbin/makefs/ffs.c | 1 - usr.sbin/makefs/ffs/buf.c | 25 +++++++++++++++---------- usr.sbin/makefs/msdos/msdosfs_vnops.c | 1 - 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index cc0f640e3c9c..17682dea2a4b 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1002,7 +1002,6 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) errno = bwrite(bp); if (errno != 0) goto bad_ffs_write_file; - brelse(bp); if (!isfile) p += chunk; } diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index fe6eaed93d04..3d03e9866b3b 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -127,26 +127,31 @@ bwrite(struct m_buf *bp) { off_t offset; ssize_t rv; + size_t bytes; + int e; fsinfo_t *fs = bp->b_fs; assert (bp != NULL); offset = (off_t)bp->b_blkno * fs->sectorsize + fs->offset; + bytes = (size_t)bp->b_bcount; if (debug & DEBUG_BUF_BWRITE) - printf("%s: blkno %lld offset %lld bcount %ld\n", __func__, - (long long)bp->b_blkno, (long long) offset, - bp->b_bcount); - if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) + printf("%s: blkno %lld offset %lld bcount %zu\n", __func__, + (long long)bp->b_blkno, (long long) offset, bytes); + if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) { + brelse(bp); return (errno); - rv = write(bp->b_fs->fd, bp->b_data, bp->b_bcount); + } + rv = write(bp->b_fs->fd, bp->b_data, bytes); + e = errno; if (debug & DEBUG_BUF_BWRITE) printf("%s: write %ld (offset %lld) returned %lld\n", __func__, bp->b_bcount, (long long)offset, (long long)rv); - if (rv == bp->b_bcount) + brelse(bp); + if (rv == (ssize_t)bytes) return (0); - else if (rv == -1) /* write error */ - return (errno); - else /* short write ? */ - return (EAGAIN); + if (rv == -1) /* write error */ + return (e); + return (EAGAIN); } void diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index c04ed6f742a1..5bc9b495c586 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -500,7 +500,6 @@ msdosfs_wfile(const char *path, struct denode *dep, fsnode *node) cpsize = MIN((nsize - offs), blsize - on); memcpy(bp->b_data + on, dat + offs, cpsize); bwrite(bp); - brelse(bp); offs += cpsize; }