From nobody Sun Jul 23 13:44:19 2023 X-Original-To: dev-commits-src-main@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 4R84K00fw8z4nXR2; Sun, 23 Jul 2023 13:44:20 +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 4R84K009wZz3k0T; Sun, 23 Jul 2023 13:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690119860; 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=kU4jRYvpmLWac0jBAtJI7lf4G7WRcJfGhQOdLZDaY50=; b=Q4UELg6Mc5JCeDlrL98RJppQlLLzIFxYl9+JcWAKZagoKqU0vSK9LEFkYyIqCSEIfxqVhy q1zBsvV136vvuzItFj6hae/OEvvvgogvet3jPr3c9/5e506DJt7RETSEtS6ehA7yn5nezF DE6Eeoa+vQqd/6vj0MIfnuaZnKl2RQdBjY6NPUE0NejsqFaZMz1vIx7Vt8rcogkeeEAJWX rXyM4dl9UnHLm8rTo7dez+M7+YA9tvebYL+V5qLetumwCkPqWWWAhonbCOToiyVWOaQcGy fJqPGev6twScrcHabBqQsyX7HCigEXi14Z7EAprzHKPBHtk5dDrc38buMZ3eOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690119860; 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=kU4jRYvpmLWac0jBAtJI7lf4G7WRcJfGhQOdLZDaY50=; b=Vrg9besn+DejZhADYa9roJ3p7EKvJ2zTWUXULPvjACYd5u2IQhhDcmLC8XyfCuf/yToA30 kA6YFcnxKUfBZjtA1Hhg/UOvIwOw9aFUTI2vl8JroQccdIhbrb99gYhGuuwiRVKQu1JpUy RpRDephg3IObx7NTR91bpt+6tCYF0OApDRt/v+sMlO8ihCZg252W58+RUMUGcuLiigymtl MnL5in+CSUm42B5ZRxqgrNwX19iL+6dQ1mNMeF/83dpDh6VhF9M/kKmYaREGlub8WtfyMw BWnoU//bL5d6lxkOg38oEkM+nHw0Co/Xt+Dz8KYlmonaGSdARMESsYUMm/aUXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690119860; a=rsa-sha256; cv=none; b=BGUNucPjWjAeLw6ckWfDkrDO/fQV4EIgg0nGJZfdq6smmIg6R8dKgKr0t8/J0aiaqFFl9e 7JfgaX3zBWbKk4aYTdAM7YubPqMW8yeM5oHkm/7rDo9EYtnWEBeZOLP/mX+fdRjIeqgycx qYkAriZnMWufF9rbyjJwPW5BD20BFp41v+YUifArSLTuurRmgNJBmb3C32ZBY5HkPdz1Nc nq/dyv2TxVx/rB/9JzyHlAiK6zG0RbaB6JRIICIlICi0CH7Y7K4aPU6+w/irQHfXZ4l60X IJQaDonFw/8Oejpv/2g8rCIz9ui/N1soXQOZCzjM+c60uyiinejNCfzDXh0ADQ== 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 4R84Jz6NWbzfLl; Sun, 23 Jul 2023 13:44:19 +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 36NDiJ0J093872; Sun, 23 Jul 2023 13:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NDiJNT093871; Sun, 23 Jul 2023 13:44:19 GMT (envelope-from git) Date: Sun, 23 Jul 2023 13:44:19 GMT Message-Id: <202307231344.36NDiJNT093871@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 4d9b2ed34bae - main - ufs: stop using LK_SLEEPFAIL in ffs_sync List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d9b2ed34bae371dcbff947ffb98a439ed575006 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4d9b2ed34bae371dcbff947ffb98a439ed575006 commit 4d9b2ed34bae371dcbff947ffb98a439ed575006 Author: Mateusz Guzik AuthorDate: 2023-07-22 07:19:03 +0000 Commit: Mateusz Guzik CommitDate: 2023-07-23 13:44:15 +0000 ufs: stop using LK_SLEEPFAIL in ffs_sync It provides nothing as either locking succeeds or fails with ENOENT as is. --- sys/ufs/ffs/ffs_vfsops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 560708883cca..9b6ef22b8cd0 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1711,7 +1711,7 @@ ffs_sync(struct mount *mp, int waitfor) } if (waitfor == MNT_WAIT) lockreq = LK_EXCLUSIVE; - lockreq |= LK_INTERLOCK | LK_SLEEPFAIL; + lockreq |= LK_INTERLOCK; loop: /* Grab snapshot of secondary write counts */ MNT_ILOCK(mp); @@ -1741,7 +1741,7 @@ loop: continue; } if ((error = vget(vp, lockreq)) != 0) { - if (error == ENOENT || error == ENOLCK) { + if (error == ENOENT) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); goto loop; }