From nobody Thu Jan 25 03:45:38 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 4TL6DL3Cpbz57c05; Thu, 25 Jan 2024 03:45:38 +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 4TL6DL2YBPz4JvN; Thu, 25 Jan 2024 03:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; 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=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=G5JfY3gB3uBjMNmfRk9jwiLEMCT2dyxXOwx7o2MJRN0COjrNaQoMFYhjiwKZDxHzfnmuyg oWjOVSxz4HPylwCZ7XpwPILNlZWBT870SohnHxKHEPVL6//tL8Es7nn/a0Pp44+p37gF6T L9sNcrlxQ1DfDua+UM2LJ3gUuWMsDOBdT8GxveSdJvjQUM8nm2j3kaEqwOlaeAWJ9NL8Rj TP3Cfxap4O3bzprt/qz1SQsxFe4eAVqA986SoxB3FX/ObAFAPh25jKV1nn5LD1cVpxQQ5z LW5bYBnwy7XUNZCj+xRimRI16XPQVG05GpBr8BIxs5UpLNfbAmXc80VDV+Ij7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706154338; 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=82AUnjJQWrZyRLgEGSWeNAt6vmZxdpuqDuqBqMg6whU=; b=K+lrew69FuJ2wvW3PSz0Tub7/ybQM6WmpWji/B9XQKqRTCbptz5Rl6y4aeR1l3ptTbHVxB 8/i4rJo5eBLLUoEEVfZEd7U7vlloirsXpA5OUd0wXfJaD23OUlFndTUBL2Kh5VlKxTA9m1 NmBYsjZlpCUpjapGgZ/YKTNK4OV2WW+VmROcZRSV1xUx6+oWl/q/jZV7DQG3Nbk71r+o9D y/JmoUSc0oCPPP2W3dpPgIA31vNwrZ/wAfv7qpx63X6MPWn/QmTqnKa5lzSua2ZHzdSP4V gQJOLInIAmYsWIvbVzdR+m/R2Jmng4Sg8n2E3UuVsmBThhjqeRHTbCE9uci15A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706154338; a=rsa-sha256; cv=none; b=RkUnHj4FZPrYzz/Po9gRu8o+FNly00b6oFKcOol8zedjW4MuPXScfjFyyH/GwHoit+SEV3 g3hg0u+77ZVfqqGMyok7ZfcSve23XcERl+QvqTKw8WkLzgGGG6hKg+voiHOV/y9THflSyO Efk0bRmQm+2B5micBnuctJyDe1q6+xIT8M8V4Cos8xN5IsNBbZbnSk/GsfmePVrohry1W7 6ZM9PDdYH4vth9exgJwIdabpyrXSJlt7InFogWv+sRCVrMrnqZGOtOp1ex8uAy+F42XROm ztb7Re11OZZ9TuVr/7lP6hiiPaV4zdeH8+XO1vjF8Vfk4Dm2CuLBQdM2KlvQZA== 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 4TL6DL1dcTzjKF; Thu, 25 Jan 2024 03:45:38 +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 40P3jc2x013219; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P3jcH6013216; Thu, 25 Jan 2024 03:45:38 GMT (envelope-from git) Date: Thu, 25 Jan 2024 03:45:38 GMT Message-Id: <202401250345.40P3jcH6013216@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: c315699722e8 - stable/14 - msdosfs_integrity_error(): plug possible busy leak 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: c315699722e8dda053f8ed6def6d014bbfa5e6d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c315699722e8dda053f8ed6def6d014bbfa5e6d0 commit c315699722e8dda053f8ed6def6d014bbfa5e6d0 Author: Konstantin Belousov AuthorDate: 2024-01-18 15:35:56 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-25 03:44:55 +0000 msdosfs_integrity_error(): plug possible busy leak (cherry picked from commit 13ccb04589e2c5c840e19b407a59e44cb70ac28e) --- sys/fs/msdosfs/msdosfs_vfsops.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index df96bcbfe9c6..03c794bad900 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1006,7 +1006,9 @@ msdosfs_remount_ro(void *arg, int pending) } MSDOSFS_UNLOCK_MP(pmp); - vfs_unbusy(pmp->pm_mountp); + do { + vfs_unbusy(pmp->pm_mountp); + } while (--pending >= 0); } void @@ -1015,11 +1017,19 @@ msdosfs_integrity_error(struct msdosfsmount *pmp) int error; error = vfs_busy(pmp->pm_mountp, MBF_NOWAIT); - if (error == 0) - taskqueue_enqueue(taskqueue_thread, &pmp->pm_rw2ro_task); - else + if (error == 0) { + error = taskqueue_enqueue(taskqueue_thread, + &pmp->pm_rw2ro_task); + if (error != 0) { + printf("%s: integrity error scheduling failed, " + "error %d\n", + pmp->pm_mountp->mnt_stat.f_mntfromname, error); + vfs_unbusy(pmp->pm_mountp); + } + } else { printf("%s: integrity error busying failed, error %d\n", pmp->pm_mountp->mnt_stat.f_mntfromname, error); + } } static int