shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: fuse-bpf: Add /sys/fs flags for fuse-bpf version"

Browse Source 
This reverts commit 2b6da462a1.

Note that this change was reworked completely after being cherry-picked
to 13-5.10, so revert this, then re-cherry-pick the version from 13-5.10

Bug: 202785178
Test: None (test with new version)
Change-Id: Idbf470e93a56e2fe5f1fda164635f6f171c2d2fb
Signed-off-by: Paul Lawrence <paullawrence@google.com>
This commit is contained in:
Paul Lawrence
2022-12-14 09:01:45 -08:00
parent 63696badd9
commit ea7caaa306
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fs/fuse/inode.c
View File

@@ -2027,45 +2027,17 @@ static void fuse_fs_cleanup(void)
static struct kobject *fuse_kobj;
/*
* TODO Remove this once fuse-bpf is upstreamed
*
* The version numbers give us the ability to tune user mode behavior to the
* specific non-upstreamed version of fuse-bpf
*
* bpf_prog_type_fuse exports the bpf_prog_type_fuse 'constant', which cannot be
* constant until the code is upstreamed
*/
static ssize_t fuse_bpf_major_version_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
return sysfs_emit(buff, "%d\n", FUSE_BPF_MAJOR_VERSION);
}
static ssize_t fuse_bpf_minor_version_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
return sysfs_emit(buff, "%d\n", FUSE_BPF_MINOR_VERSION);
}
/* TODO Remove this once BPF_PROG_TYPE_FUSE is upstreamed */
static ssize_t bpf_prog_type_fuse_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
return sysfs_emit(buff, "%d\n", BPF_PROG_TYPE_FUSE);
}
static struct kobj_attribute fuse_bpf_major_version_attr =
__ATTR_RO(fuse_bpf_major_version);
static struct kobj_attribute fuse_bpf_minor_version_attr =
__ATTR_RO(fuse_bpf_minor_version);
static struct kobj_attribute bpf_prog_type_fuse_attr =
__ATTR_RO(bpf_prog_type_fuse);
static struct attribute *bpf_attributes[] = {
&fuse_bpf_major_version_attr.attr,
&fuse_bpf_minor_version_attr.attr,
&bpf_prog_type_fuse_attr.attr,
NULL,
};

3
include/uapi/linux/android_fuse.h
View File

@@ -10,9 +10,6 @@
#include <stdint.h>
#endif
#define FUSE_BPF_MAJOR_VERSION 1
#define FUSE_BPF_MINOR_VERSION 0
#define FUSE_ACTION_KEEP 0
#define FUSE_ACTION_REMOVE 1
#define FUSE_ACTION_REPLACE 2