From nobody Thu Jan 25 03:45:37 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 4TL6DK2tVgz57bxg; Thu, 25 Jan 2024 03:45:37 +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 4TL6DK1ZRMz4JdP; Thu, 25 Jan 2024 03:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; 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=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=Ay7ZvyT3qfQCiWCmfy7CxtJJomNZmLbph680MvRLwDvxQU1mPgoiL8ChG82mvgcUusMCHT 1lB1BwimQXq4Rf3WRvXbA0LH+oBJJnAq2op5xyQKmAKKYnW0YdCuuQgT7jzn3MPS+yBE6F DI9nVtH9jgWvVkk4rUcR3DXwos6DvdbDvNk3+xj8gLEzbvh99VkpMYH3uusifQjl2Uez6/ wDQpETElavabGVYAj+Sno/kjU1jtecvy1IE8mWEEyj8pipM6lBPQro7+8kx1vItHawaXJm DlvDpzdlnBqspKuxAM9wm+M6Mw7SjIDV5loFn+w13ckBXP9EeMhW1Skl9MHSMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154337; 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=WRtHOXgHH9pYcgT5Moo/svfMVj1OpmWdZ/vbab1PLM8=; b=C1x0Gd+dvxc6V9bnh7P50AjFiIzS2vFI1Y+T/gObiCGE6OfE0tP6kar5KBSLKYX/cqMmMr hxIdH155QkCEqQL9pFGwf/6qlowvcU6eiKY6VyJjM9J4BplPpo+X9Uw5RTMKtAi03sJBt6 w8eIH7CECPJs+zq/VQ2UsAJ7Aos1e/LQK+M3KxhZKUIqG/JfUFGmGy6WvBvggQWhUGpFxJ 22pgkD0uxfhpR02MGod7eD6TcplIqyFZt9bDQcA5V5q/ORmqLIZ/NcT2Wk3Xe2PMENYii1 aHONcts0jMW5tHjiR3lX9LbY3sbp6JxafXW5XF1dkVJOxxdP4x8z9/D60O9/7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154337; a=rsa-sha256; cv=none; b=DJ4O1Y8gwtYCDARGwRjHx0RAumHi2uuYcRELwYcOT7qoSEeDe5sNo7PLxoDBzNh1ujAEEu nVWu2WXINFft5YNIyTaO73Ej4VlxmQ84n8+YN2oEFYwdkSAmXyiMnOAikwDMRr1jDagmKq R3oj50VmSB1H/uIrT1FKynnb6yEyqWvC3WqejR+NMsTV/c1HhkMBGJcZzzx8ocfIOiVicA 996uHcqeDquXNBB4RcF8f1IbveV8unj6m5MajEt1hLh/W7tZY8snSHxeYYvyb62d2I0pUD crMUYxxw2ZA9DLwRXAYjNIktXmD+s887K8UbUNTpy1fFvcfyrTSLbUt3xGa1tg== 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 4TL6DK0cyGzjKD; Thu, 25 Jan 2024 03:45:37 +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 40P3jbWB013177; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jbZu013175; Thu, 25 Jan 2024 03:45:37 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:37 GMT Message-Id: <202401250345.40P3jbZu013175@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: 884f990d95c9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 884f990d95c9663933824f3b418000cbfe20c4d9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=884f990d95c9663933824f3b418000cbfe20c4d9 commit 884f990d95c9663933824f3b418000cbfe20c4d9 Author: Konstantin Belousov AuthorDate: 2024-01-17 23:05:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +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 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; } }