From nobody Thu Jan 25 04:32:09 2024 X-Original-To: dev-commits-src-branches@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 4TL7G21Z5Zz57gY2; Thu, 25 Jan 2024 04:32:10 +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 4TL7G210CHz4Rj9; Thu, 25 Jan 2024 04:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; 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=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=IB5f/xpeSr9klMs0znb3ulOQpDr6TtWQPJ5WiGH+PYgG5WQpA0hxrE534t+cKI5jCtQPv6 b/jx5vFLl5KuY+U11NNprLdB+ncwrKXZw9G2Q2kx2ctEDFsArmgQeBhBcOR71VcbPVhhjH N8El1Ggxfrq2Egf0OoGORn12TSrUKB49mbGgdaWouIQk9rCw7jiUGyUKCl3vPtxNr8DzEO kaWijzluRw7l0PBw/XSm9EGHW9V903r5/OiVfKw16GDJ0wl35OsV/W0EVNab3og+AwS+J+ 5hDGtdeU94bD7J/xOTZAqtZHdfKp1TTPteDzfyeVUH7tYCzdXjkBh68nwNv/uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157130; 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=CKvuOpscyRqUcWzxnpzHbkSSDrivYZtQH19KVePaDJ4=; b=YgAiwGcn8RWu75+CtB1TtBtCwH2gZGH7l07bFyAae2L/Dv0L/cFB8awk2ivnTgBK8tgtvp AA0cvPnwElHsrwq6HskDRx0NTcmnGCIAn1bCHE3Sf2WK9nyYC+wVqxag3XrEnwcsqUt3GF XyeVYRYGztzcBIkTTrp8v3kXfJD5XwCkHGyCd2/qjs++bVDUTvV9/AS7XnCrTH+kNvQyUC reEdRKHRUEfHK2oLCT/A6goBfkXQJD0r7+xbEkr6ElslCt6HRG959p0e6AUq7KzQQFcf6M RTrlBSiwyobCklGPlXukm9G4tU0VaWaxvafchh4GhcOoB6PT4R23uqCh6ozUrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157130; a=rsa-sha256; cv=none; b=I2vQPEidyxRaB6vY30g07U5GME7YsFh/gt7obbPY4+imt9GLKj76JfufrFKefRfjxmTiKP dLaUAx5/tuhoZy0OHN2SsKK+CHa1z+a+DHN5qKgHG6Tdchs08QcixG3vUzuwaWTR37Xaok DbZW3bQ4TppPd1xT9/pmO6kz5pNzeGeIoeRRP48DPGS0m9BnHRg4sO5OnWtHr/1I8744mK izsApk+yXSLVR8hSdIfgQTNuEFSEgGdroLSE1Mc4LB0LRlHJmtAwjaQQzY2p08bYZ0ELVj M6eE3cI9u92+/pZUkB6fbyq10ssk2VrwQT8fagEh2IfJ3IxP+iLOfl25EHloDQ== 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 4TL7G20306zkHP; Thu, 25 Jan 2024 04:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40P4W9GJ092428; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4W9Q1092425; Thu, 25 Jan 2024 04:32:09 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:09 GMT Message-Id: <202401250432.40P4W9Q1092425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 14ef49bbadec - stable/13 - msdosfs_rename(): handle errors from msdosfs_lookup_ino() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 14ef49bbadeccf6f765025af33a07886fe3dae6f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14ef49bbadeccf6f765025af33a07886fe3dae6f commit 14ef49bbadeccf6f765025af33a07886fe3dae6f Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): handle errors from msdosfs_lookup_ino() PR: 276408 (cherry picked from commit be0df84849ff3e8fb5ec65176ffde88dbefdc434) --- sys/fs/msdosfs/msdosfs_vnops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index 3ab9e3b3665f..a2fc115e2ca5 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1192,8 +1192,8 @@ relock: memcpy(oldname, fip->de_Name, 11); memcpy(fip->de_Name, toname, 11); /* update denode */ error = msdosfs_lookup_ino(tdvp, NULL, tcnp, &scn, &blkoff); - MPASS(error == EJUSTRETURN); - error = createde(fip, tdip, NULL, tcnp); + if (error == EJUSTRETURN) + error = createde(fip, tdip, NULL, tcnp); if (error != 0) { memcpy(fip->de_Name, oldname, 11); goto unlock;