From nobody Thu Jan 25 03:45:35 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 4TL6DJ2pWsz57bxf; Thu, 25 Jan 2024 03:45:36 +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 4TL6DJ1805z4JdN; Thu, 25 Jan 2024 03:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; 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=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=NPmJsNS6PXYOW1aDhzU4b+w67hkypPEZWD4uI1dyp9PHXPnqWLUybpp0mwv27lyaDlhHm3 z/U2vFwBfGg4qt2JQDxIEg4U0obtbVw96I503fiLiQBgislQfPioAP7tefZUTaRPOHBtmm vHfGnZmgxPc8YXAFSqOb4FQnV0ZTy75ue67iSn7MlLHPfg7OljKsqeSSAC0026IDC9eaK8 b6lu99HcgkoOsvxBc1nPrPlXmZAWdAQMFbsXSmJ6wFnFJdaqgkSBr/EbhfPMnFM/T12IlN iQf1lBNaj92S80y6Tnxfzx1DfhgrSvfWXKSpZHU275R0uh3UUUuuj22P1FB06w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154336; 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=yKvNN74TpzYwIR/8QUz+NDQDbaGgWl99v5gk+17K3fY=; b=Dye35oT5JWJaSn20AROjfGyENcd+E6IRmF+bsjpjdMStJVrI/A/pqp+H139VIUrjLd4f1o rRfvuVT58tJjizDKcGBHe1RRDxqesFKmIfMZe6Zz6R6prQACWo8FUDPAnXZMAI0m46kcKl 516CzHcqeR74N38CWcd2wVN4kCzvGeaUjWsIJbkuVeAYm4A4aKFR7Ror0CAccO4N1RHypq 06n+LqyW528/4xhcrWl1ChpO9+k3OqLzz0rdFiuFrP6QW2uKJC9Aid3l02mXhIyVv2QBNq NwfMI6MKuCUGnylSryp9KP5jqjM7U3StJzZ2TufhHtkwgJUzRMSeSs7UOebuwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154336; a=rsa-sha256; cv=none; b=WlZ8NxtXEcfpxIw7iUbRNsQe3NYNkWAX7ih1og07GoQvk7TtaFmMqzpMThwDZW+5pCYOO1 /zd3UTVqgzDhL/wiKSTrJfawLFpsD6pwjkwv59my5SmHL9ZXv/+zu15iprKKcfzai/ApsQ /60hR7YOBVsSxIVkr0KJEo+/SzWVe0YqoE3L1GdaQSNB6JTqYgz4QG7Fbb9U69HIgBZFu2 ZFLSjRre3OQNkKlLNipE3PaVa3AySzUx9Ji5Y3xGU8kKzSab8juiT9QgUCwwnquVVC1fAR /+pi+P4CFfXmrEW3xLFetceRXEbZiUBrnSUEBV79bjpuf4Q40rKlq5fNWp/J0w== 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 4TL6DJ06KZzjKC; Thu, 25 Jan 2024 03:45:36 +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 40P3jZc9013118; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jZo0013115; Thu, 25 Jan 2024 03:45:35 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:35 GMT Message-Id: <202401250345.40P3jZo0013115@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: e465acd0f6b9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e465acd0f6b9bfdedd0f3dc21cde81ccade3249c commit e465acd0f6b9bfdedd0f3dc21cde81ccade3249c Author: Konstantin Belousov AuthorDate: 2024-01-17 22:55:05 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +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 c17d9f785dc2..726b1d8e5cb7 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1180,8 +1180,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;