From 5387caaa4b1a6fa5371bd96614b328ae4b137bf2 Mon Sep 17 00:00:00 2001 From: Daniel Rosenberg Date: Wed, 20 Apr 2022 13:44:15 -0700 Subject: [PATCH] UPSTREAM: ANDROID: fuse-bpf: Fix non-fusebpf build Added #ifdefs around fuse-bpf init/cleanup code Bug: 202785178 Test: builds with and without CONFIG_FUSE_BPF Signed-off-by: Daniel Rosenberg Change-Id: Ie15bb04e439b496e4842303437b3f55c3da14f2c --- fs/fuse/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 0e803d857f9f..8287dbe92967 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1911,17 +1911,21 @@ static int __init fuse_init(void) if (res) goto err_sysfs_cleanup; +#ifdef CONFIG_FUSE_BPF res = fuse_bpf_init(); if (res) goto err_ctl_cleanup; +#endif sanitize_global_limit(&max_user_bgreq); sanitize_global_limit(&max_user_congthresh); return 0; +#ifdef CONFIG_FUSE_BPF err_ctl_cleanup: fuse_ctl_cleanup(); +#endif err_sysfs_cleanup: fuse_sysfs_cleanup(); err_dev_cleanup: @@ -1939,7 +1943,9 @@ static void __exit fuse_exit(void) fuse_ctl_cleanup(); fuse_sysfs_cleanup(); fuse_fs_cleanup(); +#ifdef CONFIG_FUSE_BPF fuse_bpf_cleanup(); +#endif fuse_dev_cleanup(); }