From nobody Thu Jan 18 16:48:26 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 4TG7wp6D73z56Slb; Thu, 18 Jan 2024 16:48:26 +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 4TG7wp5hvYz40hr; Thu, 18 Jan 2024 16:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705596506; 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=8SaBYU+aGmwrNNB26EZkT9a3MmvSC7CDW4kq6rqqS1Q=; b=LbWGLW0BqooG1wJFujhffCQrm3OLVy47xvUn1G9hBORBXQeoBdoSggchqrNIJlUn6c3Qyx n/YJxNzgboAN6yVCfviyk3pTTGhUVp9VrgeTMTK7gCpkYbNyyRbFG+L8Nodh1C0Ch2nQNV 1DF7nQnchg1/55aAhPHHyqCTN4UZX8j/Ip3z6r1mPqfDK4oirXTckf1bWWTwk2Ph89Pnsv IMMbgeMTm0sQz/h2gtw66A6jQ/SANygB2CWuXuQDzNJLJI2JOzeelTuz1ygtkpSJl1rzIy 9IVAkD5JAAH1yXZ8hoLTNHxoZoKv9p1yKBV5UHtE39479HDhlBMaRW/wr51HiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705596506; 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=8SaBYU+aGmwrNNB26EZkT9a3MmvSC7CDW4kq6rqqS1Q=; b=ZGqjJmS4hUJmcFHMj7reASWbiwRPFgMKAeg4/qTkh9iQH+gCGMpinPOf4rW3FLnxEYsBel 0Tu9LD2nA0LjsabEBevK+J3SxIbmqF+VzT8kMM8QHO4ZlTgi5gX6aPuTlJGIpfbo+w/qD3 ug29morHDy8x6+3/JumnCp7QrKysd/4dhd/3CiCAv/8twM131Qsx3gRE4NQZAYjkqU7icx sXnerc3VRZX/XRlGEf7YWjiIn/LKoMIPL2sgFXr/Il4N0/qqzN1KPv68NQjtWhWLQbj4KZ jnDDsseMUysltTI0pu+c494wI0hMk59eubomAF+kj/QhUAnhEa7So6PKxTOIUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705596506; a=rsa-sha256; cv=none; b=NHX+qfJU7V5q/UmBs/RQSnGV1+G9MkJfQT3kObR8nPQkjs5M85hj/1+U8N2NFRf+xQIoiy QeIwoYzT3Jl1bbhElIBSJoJuM1Z1mSwOBZhNeTIwMne9J+IhU31R6PQcZBCJ2gIeEEkLZn R+c81a5vM5SHCjOcMwgMa2WbdiScPSrO4m2WiuZX1M9JkrM5qvxG8Fa/Fsnjfqddeze2xm GndvtqN3XSR3gAIv0Q7jOqNed+0pqK9CjUKgcP8crotvcgl6awGnGR9neSgDv99TltYF74 MWlCkEaV6jUALW2+bDJbl9A6WwbD8hsCv3we/ldqXN7M7fEpskvEQxJTAGj7zA== 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 4TG7wp4lrPzFPn; Thu, 18 Jan 2024 16:48:26 +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 40IGmQ1a013139; Thu, 18 Jan 2024 16:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40IGmQkL013136; Thu, 18 Jan 2024 16:48:26 GMT (envelope-from git) Date: Thu, 18 Jan 2024 16:48:26 GMT Message-Id: <202401181648.40IGmQkL013136@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: 661db9b390b4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 661db9b390b4a40418d838876b58d2186d72aabf Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=661db9b390b4a40418d838876b58d2186d72aabf commit 661db9b390b4a40418d838876b58d2186d72aabf Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-18 16:48:05 +0000 msdosfs_rename(): implement several XXXs about downgrading to ro Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43482 --- 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 726b1d8e5cb7..31d9b003a6fa 100644 --- a/sys/fs/msdosfs/msdosfs_vnops.c +++ b/sys/fs/msdosfs/msdosfs_vnops.c @@ -1203,7 +1203,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) { @@ -1237,7 +1240,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; @@ -1250,7 +1256,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; } }