From nobody Mon May 16 22:48:21 2022 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 964CE1AD224A; Mon, 16 May 2022 22:48:21 +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 4L2DtY3mXDz3h5d; Mon, 16 May 2022 22:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652741301; 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=qWoCFme3LcCSZWhi+W6vDLYhPuFHH+Ti0g2PzaRJSho=; b=Bs8p79nn4ESOA2Si1kIPZ+1TMArqetN6Amtui9GSEddO06/iKtijPo4sA9dRbLpphUTjQO G7TJ7r8NOVgSaqmAhxoU37XFy8tnZKp+XiMNVT6K7XYzVgqrC0Shxz/3qBdyhFjqQnwccD TMwrh3gepCWZVxPz88/+bUjD4fILzSIh00++t0oQ5h+IsTFptfn2IhtflAhx3K21dE5PJl PVVRL3RCzdhZUr4mqUpI9DyantbDwUDxBI6eOLWun/OMyo8atBJu5nytnfFSA9p5zrEh7X S5QA1VipyIR8wY925cpAd9Op2hAvdkkl+L9IK6nnKsCIJv1JvsNpMi6WdVCqeQ== 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 5D2AD46C; Mon, 16 May 2022 22:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GMmLSX003322; Mon, 16 May 2022 22:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GMmL3r003321; Mon, 16 May 2022 22:48:21 GMT (envelope-from git) Date: Mon, 16 May 2022 22:48:21 GMT Message-Id: <202205162248.24GMmL3r003321@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: bc6860ca7cfa - stable/13 - ffs_use_bwrite: make the superblock snapshot more consistent 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: bc6860ca7cfa4f3d317dd6380b3852a9db99bb16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652741301; 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=qWoCFme3LcCSZWhi+W6vDLYhPuFHH+Ti0g2PzaRJSho=; b=x0Uze8MVf80IvFZGRfOqYMfnds1e5RV4s24wP9l+hMWAhD4u2+EHj6jQvjSE8SSAmeTjWD CRB+Hiz8eTjuQC5zA5Q9CyunyJCO7WnFIx8c/AtPHQkY7X21zbmODmHyFvuaPvszQjDbkf rv/nrzmpCOCtGhn26uS9XL4OrVU+tl9DueazR6NjSshSEjzq+4+sk8mw8AZtWIxtXP/TNO sbVJLIYYiPsRpsYvAOl1zrtaVA2p1t0qrLO5xxkrepCLZU0bOnMj/iVgONEQF2mk+LP+se TTbp37Y55ifGf0gNOg/chR/3Ydwn4KfBNCQ9yZ2dZUh5BilRUJkGZmkOa1OE2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652741301; a=rsa-sha256; cv=none; b=PE13+fBtf18Db21wVxUlqzQGyvh90953Y/dG0wXKmUll4RigAhyZRENpD1oeEwA21PXyxL NJExiQ8FCbR1R6H3Hk/ouJgi2QyPF8hurhEVmH46cLGAGTnk+SbuA1rK4BN1B/yNRACUCh q8cBaoONaQiFRSGwMul8QDNfr0tR0GToY6x9uOyhK6RisOXf+lirH5PSapr22nY8RBnpp6 V4769CZJ7ySiCS0+HzYWnxUSrr7+kKdqvJryeA8MLjSDc/7jmxyR9a4+jt6/XoJEhx5Apg NoOV+2KIt7LyvKuY0Gmn+IkC35YBLpNO2FAId4Yak0wc32ABMav0+iamxIgoUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6860ca7cfa4f3d317dd6380b3852a9db99bb16 commit bc6860ca7cfa4f3d317dd6380b3852a9db99bb16 Author: Konstantin Belousov AuthorDate: 2022-05-08 14:00:37 +0000 Commit: Konstantin Belousov CommitDate: 2022-05-16 22:32:55 +0000 ffs_use_bwrite: make the superblock snapshot more consistent PR: 263765 (cherry picked from commit 4ac2df8f4cd91017c000543224204f823008f699) --- sys/ufs/ffs/ffs_vfsops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 3997c026859c..c749ecbcded9 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -2267,7 +2267,9 @@ ffs_use_bwrite(void *devfd, off_t loc, void *buf, int size) } if (MOUNTEDSOFTDEP(ump->um_mountp)) softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp); + UFS_LOCK(ump); bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize); + UFS_UNLOCK(ump); fs = (struct fs *)bp->b_data; ffs_oldfscompat_write(fs, ump); fs->fs_si = NULL;