From nobody Thu Jan 25 04:32:11 2024 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 4TL7G32YMTz57gVD; Thu, 25 Jan 2024 04:32:11 +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 4TL7G3204dz4RS4; Thu, 25 Jan 2024 04:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; 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=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=bw5dSZNdlsnQFXOXcPfCpBKw4OU1/m7NAVv5+mjXb+Lyq0TCxahnfu2HrbBAwmUYlBZq6I 0qoRATU1SaUYqXHtzvRW8NQMzkJyx7iPfO8Zlp1Z8oDR/aEayODro7LIpGD3ciqhWy7Ekx Y5SfMY00LZLOuI4NdoGmd2ycGYtGPMqj+euRhwiuKQ73eJJI+y0P4/nWuetudJxZ7IgO+z FpA5/vI5SfxzD+JwZmfBXGMJ6dzQGoVobPIapwZExR0rQnAySwQPOcxck5gK0ZHID1wdoE cMV3bf+CaC4BFyvSKN0gkirQ+qVg9fouIEQnFiAXjbGZBj1XfEeibWgn4jkAVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706157131; 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=im06dLLY2a/WJEzCpCPaj2gHTq+3b/kHX5lEMWTrWQk=; b=stK2sRGJYCnsbQ/fmtDdSJHJBoK9+aZnFbt7h1zDZPlPq9UdIuh8Nebc0Rh1NQB7xnP79y e7LmRemHrLp72KPRdXSiPutUVI1K2FlfVpVvBJoLviss8ML4wNCm4L0lijoZW1i9dKX0WY 3y/tyBzjNfL6/hMF1a6FcNqYFus55o1NBLmriyRtRP0BkxsYSeIh5Mg5cKRB3mpDjiTtUm XiLi2nuDTb0JumS7xxaiLtmUhyrqQHsZC1UNhkKLuqUgMkwUi/6QDXOpwihcKspqRNY/DP xlRKIHWyfIM2Y3l61mneTv/7e8VI/bTwN50fVMnoQ9j+nwYY+KMtFi4DvuAN4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706157131; a=rsa-sha256; cv=none; b=biiEzb+Qi7djD8FiLI+TWVvRQqUfWcVlNzjslZzd1LMljizrxNi8rQOFUwwh/JeR/MUUop jzFR8CCObV5RV2g0fTWD/dSYw7BmYDQcJ2xi2doVdiA5UQZepiNUpMU8e5hAncKoijytAh MsrebQC8HFN2Agfb7QlenN0GS98/BlHqiy50z9qhvOAHHZs4mc7gtRVyHUoNKVUgeiGOlk bmAPBIRPePWMIaMVBoAUgulLsdWSqN0AxPFRERUY1TMohP2qalwqTr7JAaMFsRcXCCj8nb DyAQOz4nAdKX/uT1LawhU8+qcLYV4UxOwsjFcUtGS5TbbQZmNLLwZQKt9coBDw== 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 4TL7G313Hyzk8L; Thu, 25 Jan 2024 04:32:11 +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 40P4WBxv092479; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4WBK5092476; Thu, 25 Jan 2024 04:32:11 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:32:11 GMT Message-Id: <202401250432.40P4WBK5092476@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: 2ce0f6fb8d83 - stable/13 - msdosfs_rename(): implement several XXXs about downgrading to ro 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 commit 2ce0f6fb8d830913b978bd5ff8a1fbdab94a3ce5 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-24 13:04:38 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro (cherry picked from commit 661db9b390b4a40418d838876b58d2186d72aabf) --- sys/fs/msdosfs/msdosfs_vnops.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c index a2fc115e2ca5..1d296c019331 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1215,7 +1215,10 @@ relock: MPASS(error == 0); error = removede(fdip, fip); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: removede %s %s err %d\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + fdip->de_Name, fip->de_Name, error); + msdosfs_integrity_error(pmp); goto unlock; } if (!doingdirectory) { @@ -1249,7 +1252,10 @@ relock: error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster, NOCRED, &bp); if (error != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block read error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } dotdotp = (struct direntry *)bp->b_data + 1; @@ -1262,7 +1268,10 @@ relock: if (DOINGASYNC(fvp)) bdwrite(bp); else if ((error = bwrite(bp)) != 0) { - /* XXX should downgrade to ro here, fs is corrupt */ + printf("%s: block write error %d while renaming dir\n", + pmp->pm_mountp->mnt_stat.f_mntonname, + error); + msdosfs_integrity_error(pmp); goto unlock; } }