From nobody Sat Mar 19 13:18:58 2022 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 D7B8A1A3329A; Sat, 19 Mar 2022 13:18:58 +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 4KLM0L5jmnz57k4; Sat, 19 Mar 2022 13:18:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647695938; 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=fQVi8gUcmtAO67d3Ka9VUWIIp7y9c8WLYznOkb5/txE=; b=FTuEqHp2LJblYhCRzAqkfX74LhoeZinnKYVOmN6kAaPJ8BX9HOgHOcqfnDFyLRuF19y8By pQGKqaRGoKTe9ELc1u2iQ+x/H7i8guCKkrSeJRNbN8Ek9qkf14sxU+EIucwp3h//FWUe83 SP/neVeG1k42h/9FGE3khHFkYTwJG58SqJdGhY183uqt0Qp7Xh0WqsTcDBAcFYBU7+9qHR NS2KEL4oPC4W26RTD76S0CtPzWuUCY720txw+m3MT2GeodetL35f9SRtqClqXWe3i+4dDH e9VmMihVC7jL3UHyJ68IiPUZokQMYBLdSxMlT3a2H/rZTVsG5siWNir/UuGZqQ== 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 A3FE213EBB; Sat, 19 Mar 2022 13:18:58 +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 22JDIwWG028482; Sat, 19 Mar 2022 13:18:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22JDIwut028481; Sat, 19 Mar 2022 13:18:58 GMT (envelope-from git) Date: Sat, 19 Mar 2022 13:18:58 GMT Message-Id: <202203191318.22JDIwut028481@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: eb574ba0b61a - main - vfs: replace VFS_NOTIFY_UPPER_* macros with an enum 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb574ba0b61a992e83dc96133ecfbcd4718b9131 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647695938; 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=fQVi8gUcmtAO67d3Ka9VUWIIp7y9c8WLYznOkb5/txE=; b=apVf8e8EYjbK35X+TqwCvmtTBM59vEK/YOcFVU+hi1c92B0mqtf0r0iDokwK0Oz4z676gH HG7dsUS0FJqsXJ4BwnSmI71lyt1zwOw3ziCZAoW+zgSkLmJfIjnWNPh5wFw9eO6tHUvN+F tSfHIRtdY77Hmq1jtu6s3TgIn1BjSOKT9twosIkUHVRK+7D6H9R8dmjCPDBB6hX0FtBVoM WPTorc9mJ2NgWHJd0rLDA5uFnLLo0SQPM2AY/iWzwV8dXtaKbrLYffqmQ4CIZ5JqXd8Heo zUtn4CXYd/SI5eP2fmMODGiGBa+tkP1SXKEpx0C7M0OG3kxXEZL8NWQ0IREoIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647695938; a=rsa-sha256; cv=none; b=H1aUxc/dFLoHLDX8YauoIOJKml6aZtpiFUH/gZQ5gd31IjjXpYfcXp96vQ1Z6Ioym7FRR9 cE7nIt0L7Nu71+JXEONWMlqFxMvnLv5tWcXrTVJLD1Laep2BtKL8YMO+Mpqd7zkHAAlbRg E+/rwkNpXqLGvVCEXMYpAHu4IkVoS4PhzNems6KCHZGwNvr5s1jqlSa+VxPB6Ws4ASdKfa jfJ77c8X9Evx94pgtULCGoqzztrjOgeSx3E/jKjTW6X/qA6lyAmeNl5bCHUE2G4JWKEqbA reCJO6qEjuK3cTkX0iR27JNNEwUZ0aXKw4IU5ls7RtBu3aRaMtd2dlsrm2f2oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=eb574ba0b61a992e83dc96133ecfbcd4718b9131 commit eb574ba0b61a992e83dc96133ecfbcd4718b9131 Author: Mateusz Guzik AuthorDate: 2022-03-19 13:15:55 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-19 13:15:55 +0000 vfs: replace VFS_NOTIFY_UPPER_* macros with an enum --- sys/kern/vfs_subr.c | 5 +---- sys/sys/mount.h | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 3bdf1bdc855b..c498c9193754 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3942,7 +3942,7 @@ vgone(struct vnode *vp) * Notify upper mounts about reclaimed or unlinked vnode. */ void -vfs_notify_upper(struct vnode *vp, int event) +vfs_notify_upper(struct vnode *vp, enum vfs_notify_upper_type event) { struct mount *mp; struct mount_upper_node *ump; @@ -3966,9 +3966,6 @@ vfs_notify_upper(struct vnode *vp, int event) case VFS_NOTIFY_UPPER_UNLINK: VFS_UNLINK_LOWERVP(ump->mp, vp); break; - default: - KASSERT(0, ("invalid event %d", event)); - break; } MNT_ILOCK(mp); } diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 0434aeaa38c5..6941048656d1 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -939,9 +939,6 @@ vfs_statfs_t __vfs_statfs; VN_KNOTE((vp), (hint), 0); \ } while (0) -#define VFS_NOTIFY_UPPER_RECLAIM 1 -#define VFS_NOTIFY_UPPER_UNLINK 2 - #include /* @@ -967,6 +964,11 @@ vfs_statfs_t __vfs_statfs; }; \ DECLARE_MODULE(fsname, fsname ## _mod, SI_SUB_VFS, SI_ORDER_MIDDLE) +enum vfs_notify_upper_type { + VFS_NOTIFY_UPPER_RECLAIM, + VFS_NOTIFY_UPPER_UNLINK, +}; + /* * exported vnode operations */ @@ -1020,7 +1022,7 @@ int vfs_modevent(module_t, int, void *); void vfs_mount_error(struct mount *, const char *, ...); void vfs_mountroot(void); /* mount our root filesystem */ void vfs_mountedfrom(struct mount *, const char *from); -void vfs_notify_upper(struct vnode *, int); +void vfs_notify_upper(struct vnode *, enum vfs_notify_upper_type); struct mount *vfs_ref_from_vp(struct vnode *); void vfs_ref(struct mount *); void vfs_rel(struct mount *);