From nobody Fri Jan 20 03:23:53 2023 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 4NylG167Z2z30vk9; Fri, 20 Jan 2023 03:23:53 +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 4NylG1288Bz3pFx; Fri, 20 Jan 2023 03:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185033; 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=+Q5U2rrdcRHTCBlTkK9R8V//PTGjutgHiQH84znftMc=; b=pbIakTgE+/PertXG7jwdOh9cRPFC3H6R9Xh2par6UEIqK6cdyaeOHYswEgYXGCe0FBU81g h3J+gr8HqatKGafuqWsVwJCzImgBQM50qVKG9fOtzO0dsggbBi2JSxMFFn6IZlq4YM8mf7 mPYQyX5PUdrC0AS0RqIoFuVhQKRRDy9SLBz0AK/5qFWIx0+lN5LHpgKDm/1MoT5ZFQwwDd J2daZqU+bRP+ahCoqV0qftj5HIOJlzAcBMRyaEc3jXV0Kilk+pMXlKf7iQlucvR4rbAga4 X80yn9hCgQu2itJVHufYmQAIsGus+51jzBC0vMF2dusBTr1ihh2sNjA7Swl03g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674185033; 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=+Q5U2rrdcRHTCBlTkK9R8V//PTGjutgHiQH84znftMc=; b=ZFmuaRo10ecKDHO8uz7jFQfFq0/crsUm+07I5YasgvnQSZNjapZNfuVlFmWXsVnBgStzYM cJU9igTzvoYtmPicUFkf9uhfKIox8Yn04lyfAGN5SAQpbDGH6b2eMA/YIszQO5ccyCAvNa ulgHkSsdPb7vSHQKWHdzHoBz7rzF1iUwZiJqG0kHSTT8jGPNbq6KRJ6Rextjf6NEZ4Y2zh 7vNrMEjA939dcJAJBgImmXbX5DGnmvuF7zl9t646U7NpgM2QU8O0cQXy+gvNbfGnBzubaE hyEiHmZyZHN1wlU2R/cDVtKzXavXMQwlPe0T+FutkdlOCeSny2h2kt7+BIfDCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674185033; a=rsa-sha256; cv=none; b=kWlZLnXcZMVo+efeRkx6RIcRB3QF1A3t58/34lhCX9IAu+U+/4vRgQFfBNy/qfK3PDOR2W QH99BphArTosoC3KPgZ1533FlxB9loII7TLQQZC6unuibdSJ4oWh5FCmIZcxEq9DDEHB5I lr4dRqRougY7ZB8CVTgEmR9EF0ZTshrSracTH52QVxFoD1Z7Yk+TxP3shlpo5dxIDv3+of 3Of1lwms4H6ZN2NDVlMIUd0yhpSNlrcObEoGkZxgRtLo6SHNY4RiLDT3yJYejF3lKtcSa+ mFSX7kwfcEtomzRv9TzLrM6HJxXRJBQF2shAd38WYBHug3QrqlrjYLy6xAqSxg== 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 4NylG11D4tzG9M; Fri, 20 Jan 2023 03:23:53 +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 30K3NrMF042772; Fri, 20 Jan 2023 03:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30K3NrMO042771; Fri, 20 Jan 2023 03:23:53 GMT (envelope-from git) Date: Fri, 20 Jan 2023 03:23:53 GMT Message-Id: <202301200323.30K3NrMO042771@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: 9bdaaaaa3221 - stable/13 - UFSSUSPEND: unbusy mp in EDADLK case 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: 9bdaaaaa3221f410f20d19d785d27487094d0fd9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9bdaaaaa3221f410f20d19d785d27487094d0fd9 commit 9bdaaaaa3221f410f20d19d785d27487094d0fd9 Author: Konstantin Belousov AuthorDate: 2022-12-29 22:09:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-01-20 03:21:44 +0000 UFSSUSPEND: unbusy mp in EDADLK case Tested by: pho (cherry picked from commit a5ff86646ee4602a141a24eee95c1c60bb375030) --- sys/ufs/ffs/ffs_suspend.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/ufs/ffs/ffs_suspend.c b/sys/ufs/ffs/ffs_suspend.c index a68f25d5eed2..5e3258089fd0 100644 --- a/sys/ufs/ffs/ffs_suspend.c +++ b/sys/ufs/ffs/ffs_suspend.c @@ -310,8 +310,10 @@ ffs_susp_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, */ error = curproc->p_numthreads > 1 ? EDEADLK : descrip_check_write_mp(curproc->p_fd, mp); - if (error != 0) + if (error != 0) { + vfs_unbusy(mp); break; + } error = ffs_susp_suspend(mp); if (error != 0) {