From nobody Wed Mar 06 07:43:59 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 4TqPZS1pN0z5C0r1; Wed, 6 Mar 2024 07:44:00 +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 4TqPZS16Qtz4gmK; Wed, 6 Mar 2024 07:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711040; 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=8qDt2rDvyzIRW5W+76wlbYCaV0hx5YWGGssq/IfMTVc=; b=d1hlTwUkl64sXfHT5COpSbPHKjEEDsFfU+UKJu2ZdKKGaIA/0/QGRzlRfBSbBh8ARXfHfE hIeTrVnO3Dn31ZJ9j0JGy7wWmVwpxwnOLi96gzFNoicMmkDBuYockjWEdALoe5fj3pFEUX 5AEl2w1BL/jVuFfZh4XmX9gl2PT/e0Vb3JE0H8bMumpWrnLDN7fJsMwjwpUs4q80myFXgW muHYE1G32cdhIg+sUpcz/YYRDyH5khlV9BZfQb5eGs3bs8m5V5j/va57UEZj7Nqemgzjs8 Ahd1bSb58HcSjrjk4w9DK0hQytRuKt3ofRTQoH+n3g6Q+XDSrjVFYJQ19ttvIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709711040; a=rsa-sha256; cv=none; b=V9a5Tsz/pG/iDyu9z0cV9wkxjq98OtqVZo6UrcIhyuMgceJLHUd6Ree3WeOGcXvpsmbLHJ z8xxW1mEvIJpeU9gfDyZgjq18wbz8AcKowwvqjbgmbl1VuQD0W2zrGm/urz9hirydYJGBs PsJYYhWZJkk5Cw0Ob4LINFMilUX3KyBLKgdVTYYFFb0ZRUypgBAw7jBctTfum/aS73YcsR gFfbYk8bzkP6YQTZAemhEJKdNjftK48tMeV9dC3uyer7LEazPr3O7RTZi1dZ9AZlrAN/Bw CqNtOiZiGecSVDJZzOX62sMsqHhnYQy7MftQaTky6jwwk9xxaM5YobtdgdnHQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711040; 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=8qDt2rDvyzIRW5W+76wlbYCaV0hx5YWGGssq/IfMTVc=; b=BswLofMB2IpbJ/KB0sdxru3Zmi18d/5TR39FVusKxuXwtHj8SFPuslLH/nvmsf6JdrshDz URWjWMPZjU0wgaejjgg0p1PJtvExuM7IfwpCGKPelYAO0VphFfrNo8MpHWuTH3m1MRwtlH Z1Hr23xGBaOjV/GK5dD1rXdNYCrq/LPoq/woZEcFk6uFuKo+o3dZirG0kIA6gXlJIwq+Vy Fe56lPHMY92ERPslWs8/WME/RRVePUxw70hlkuil8mNK9QlFUCBmAvE0yy7sIZ2ixNyIGK 8vU7ymAgcnZWitCoCyDVBzFXBdx4kcwtZt1i+gnEjEPv6o3rwEa3uFE/3sYaFA== 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 4TqPZS0dbhzh5R; Wed, 6 Mar 2024 07:44:00 +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 4267hxZQ042447; Wed, 6 Mar 2024 07:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4267hxsx042444; Wed, 6 Mar 2024 07:43:59 GMT (envelope-from git) Date: Wed, 6 Mar 2024 07:43:59 GMT Message-Id: <202403060743.4267hxsx042444@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: f3a53319f6d2 - stable/14 - sys/mount.h: align values of MNTK_XXX flags 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: f3a53319f6d290cbccc74274983ee7597064e700 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a53319f6d290cbccc74274983ee7597064e700 commit f3a53319f6d290cbccc74274983ee7597064e700 Author: Konstantin Belousov AuthorDate: 2024-03-03 05:14:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:43:38 +0000 sys/mount.h: align values of MNTK_XXX flags (cherry picked from commit 2496fb72cf37bb9aa0cbd108ded06324ea52bd11) --- sys/sys/mount.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 9c36657f69f7..7a85d94cb4f2 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -481,37 +481,39 @@ struct mntoptnames { * the filesystem to cancel operations that might otherwise deadlock * with the unmount attempt (used by NFS). */ -#define MNTK_UNMOUNTF 0x00000001 /* forced unmount in progress */ -#define MNTK_ASYNC 0x00000002 /* filtered async flag */ -#define MNTK_SOFTDEP 0x00000004 /* async disabled by softdep */ -#define MNTK_NOMSYNC 0x00000008 /* don't do msync */ -#define MNTK_DRAINING 0x00000010 /* lock draining is happening */ -#define MNTK_REFEXPIRE 0x00000020 /* refcount expiring is happening */ +#define MNTK_UNMOUNTF 0x00000001 /* forced unmount in progress */ +#define MNTK_ASYNC 0x00000002 /* filtered async flag */ +#define MNTK_SOFTDEP 0x00000004 /* async disabled by softdep */ +#define MNTK_NOMSYNC 0x00000008 /* don't do msync */ +#define MNTK_DRAINING 0x00000010 /* lock draining is happening */ +#define MNTK_REFEXPIRE 0x00000020 /* refcount expiring is happening */ #define MNTK_EXTENDED_SHARED 0x00000040 /* Allow shared locking for more ops */ #define MNTK_SHARED_WRITES 0x00000080 /* Allow shared locking for writes */ -#define MNTK_NO_IOPF 0x00000100 /* Disallow page faults during reads - and writes. Filesystem shall properly - handle i/o state on EFAULT. */ +#define MNTK_NO_IOPF 0x00000100 /* Disallow page faults during reads + and writes. Filesystem shall + properly handle i/o state on + EFAULT. */ #define MNTK_RECURSE 0x00000200 /* pending recursive unmount */ #define MNTK_UPPER_WAITER 0x00000400 /* waiting to drain MNTK_UPPER_PENDING */ /* UNUSED 0x00000800 */ -#define MNTK_UNLOCKED_INSMNTQUE 0x00001000 /* fs does not lock the vnode for insmntque */ +#define MNTK_UNLOCKED_INSMNTQUE 0x00001000 /* fs does not lock the vnode for + insmntque */ #define MNTK_UNMAPPED_BUFS 0x00002000 #define MNTK_USES_BCACHE 0x00004000 /* FS uses the buffer cache. */ /* UNUSED 0x00008000 */ #define MNTK_VMSETSIZE_BUG 0x00010000 -#define MNTK_UNIONFS 0x00020000 /* A hack for F_ISUNIONSTACK */ -#define MNTK_FPLOOKUP 0x00040000 /* fast path lookup is supported */ +#define MNTK_UNIONFS 0x00020000 /* A hack for F_ISUNIONSTACK */ +#define MNTK_FPLOOKUP 0x00040000 /* fast path lookup is supported */ #define MNTK_SUSPEND_ALL 0x00080000 /* Suspended by all-fs suspension */ #define MNTK_TASKQUEUE_WAITER 0x00100000 /* Waiting on unmount taskqueue */ /* UNUSED 0x00200000 */ /* UNUSED 0x00400000 */ -#define MNTK_NOASYNC 0x00800000 /* disable async */ -#define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ -#define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ -#define MNTK_SUSPEND 0x08000000 /* request write suspension */ -#define MNTK_SUSPEND2 0x04000000 /* block secondary writes */ -#define MNTK_SUSPENDED 0x10000000 /* write operations are suspended */ +#define MNTK_NOASYNC 0x00800000 /* disable async */ +#define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ +#define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ +#define MNTK_SUSPEND 0x08000000 /* request write suspension */ +#define MNTK_SUSPEND2 0x04000000 /* block secondary writes */ +#define MNTK_SUSPENDED 0x10000000 /* write operations are suspended */ #define MNTK_NULL_NOCACHE 0x20000000 /* auto disable cache for nullfs mounts over this fs */ #define MNTK_LOOKUP_SHARED 0x40000000 /* FS supports shared lock lookups */