From nobody Sun Mar 03 05:15:33 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 4TnVQY3M4kz5ByZK; Sun, 3 Mar 2024 05:15:33 +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 4TnVQY2Yv0z47dy; Sun, 3 Mar 2024 05:15:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709442933; 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=qcUWDgM+SgbYR7s+gLhqMOQ6Y3mRmoZ2TZrHubqFNFM=; b=psZFvg6cZnjBA+cXvpITBSwoqYwa3L6tsexbtfsoyY+Qiko44AmJFk7fNUFqPxQ0x5HSP0 6LcAkHiwqx+ocQt56xdVkL224TJrYzSZJKyNawHl1TpAiJlfvoqGVghv5iN+ZalzZSTQUC lidIHp2b9t71bZlAkynwAj25mKmrrXf5uNdJ2N0zGc/CJX/0XKo6aAH8O9WS1EBszSI1nU yQSsjwfrg8VlV9uNEzzT3uGfLHXhOcaApBDRXT6fORC7sO7w+fWeGnCiIKkCYXVJpAnxLg j6LEc7D1fccOp9WejAdfTOQOfzSahko/UrAfrOjx9WbH9yMgxoCOqoAaJiZrUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709442933; a=rsa-sha256; cv=none; b=PRiRCmV6V3spOV6phxIuScW6Fi4nrjTtqFVg5whbfBjvuCQSmZuMoe6ZhPARgA9xO5Sr0U HPXLVrZDqeUKpCkAvVSi8X60mQN/VBnxjX360GgyEfI7ux6YAOiRHU/KX5M+dAwB6VOAUm wRc9LTMM/SFjGUBiRG8mJbGEEj6rQMf0tvHeDkoIUQgNjKnkXUs01mmqxJ/L9fNOgMRgkB PpRDUF+8IJSFjZXDfYpBOm3vtxi6HNy4zbrybiVwxra8pAn5li/Gvd7+NX1nr30hQb91ra LiJnoANBXh1YHBzoh1Kd2hRJtXOPLCSA/OkkIQJEVYb5Xjtxr1848zEZyw/SfA== 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=1709442933; 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=qcUWDgM+SgbYR7s+gLhqMOQ6Y3mRmoZ2TZrHubqFNFM=; b=aoFde6iUwn1C3NHThMjhGOq7lG1CpUGldEre9typaa5dPYPXqPnqE/mfuoLLQgAbW5ZUk9 HT8H41CLzyLeuxFjRH2xr05iJfobNDCEQOETR+9SjHEZ/5+rShJqCTNcxF3kq6lTgnToVr x+nsjJGEHu1W6bTyM3STe4vw3xjdtNTjYJJwm89z5sUr0YAGYdA1Hv1GGv2qdeP9mmstQi 7fIhZvmoaH0fAb7/1/hlFjYboeg73z9ErpOlDAeNbbEoWeFGQsvY4oDiaxtZTC001Al7BC StMMRvY1w7JrTKXR5WKdk6KTquNnu0IVfSLl0tD6ZNrguePCtyTeub5gfdG7NQ== 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 4TnVQY29JkzQ1S; Sun, 3 Mar 2024 05:15:33 +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 4235FXvG002643; Sun, 3 Mar 2024 05:15:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4235FXrV002640; Sun, 3 Mar 2024 05:15:33 GMT (envelope-from git) Date: Sun, 3 Mar 2024 05:15:33 GMT Message-Id: <202403030515.4235FXrV002640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2496fb72cf37 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2496fb72cf37bb9aa0cbd108ded06324ea52bd11 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2496fb72cf37bb9aa0cbd108ded06324ea52bd11 commit 2496fb72cf37bb9aa0cbd108ded06324ea52bd11 Author: Konstantin Belousov AuthorDate: 2024-03-03 05:14:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-03 05:15:12 +0000 sys/mount.h: align values of MNTK_XXX flags Sponsored by: The FreeBSD Foundation MFC after: 3 days --- 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 529263204bd6..ac84c99ac74b 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -479,37 +479,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 */