From 115315abddf132472ddc1e707fa49e74973b7989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=87=E8=BF=AA?= Date: Fri, 17 Feb 2023 10:24:33 +0800 Subject: [PATCH] change bid to appid in order to fix hmdfs in ohcore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张文迪 --- fs/hmdfs/authority/config.c | 12 ++++++------ fs/sharefs/config.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/hmdfs/authority/config.c b/fs/hmdfs/authority/config.c index 2daadd40704e..1610ca90272e 100644 --- a/fs/hmdfs/authority/config.c +++ b/fs/hmdfs/authority/config.c @@ -266,10 +266,10 @@ static struct configfs_attribute hmdfs_##_attr_##_attr = { \ .store = hmdfs_##_attr_##_store, \ }; -HMDFS_BUNDLE_ATTRIBUTE(bid) +HMDFS_BUNDLE_ATTRIBUTE(appid) static struct configfs_attribute *hmdfs_battrs[] = { - &hmdfs_bid_attr, + &hmdfs_appid_attr, NULL, }; @@ -280,8 +280,8 @@ static void hmdfs_config_bitem_release(struct config_item *item) hmdfs_info("release bundle item"); bitem = container_of(item, struct hmdfs_config_bitem, item); - remove_bid_hash_entry(&bitem->str); - remove_bid_hash_entry(&bitem->str); + remove_appid_hash_entry(&bitem->str); + remove_appid_hash_entry(&bitem->str); free_bitem(bitem); } @@ -336,7 +336,7 @@ static struct configfs_subsystem hmdfs_subsystem = { int get_bid(const char *bname) { - return hmdfs_bid_get(bname); + return hmdfs_appid_get(bname); } int __init hmdfs_init_configfs(void) @@ -371,7 +371,7 @@ void hmdfs_exit_configfs(void) hmdfs_info("hmdfs exit configfs"); configfs_unregister_subsystem(&hmdfs_subsystem); - clear_bid_hash_entry(); + clear_appid_hash_entry(); kmem_cache_destroy(hmdfs_bid_entry_cachep); } \ No newline at end of file diff --git a/fs/sharefs/config.c b/fs/sharefs/config.c index 9bea53e555ad..874574c4e58f 100644 --- a/fs/sharefs/config.c +++ b/fs/sharefs/config.c @@ -263,10 +263,10 @@ static struct configfs_attribute sharefs_##_attr_##_attr = { \ .store = sharefs_##_attr_##_store, \ }; -SHAREFS_BUNDLE_ATTRIBUTE(bid) +SHAREFS_BUNDLE_ATTRIBUTE(appid) static struct configfs_attribute *sharefs_battrs[] = { - &sharefs_bid_attr, + &sharefs_appid_attr, NULL, }; @@ -277,8 +277,8 @@ static void sharefs_config_bitem_release(struct config_item *item) sharefs_info("release bundle item"); bitem = container_of(item, struct sharefs_config_bitem, item); - remove_bid_hash_entry(&bitem->str); - remove_bid_hash_entry(&bitem->str); + remove_appid_hash_entry(&bitem->str); + remove_appid_hash_entry(&bitem->str); free_bitem(bitem); } @@ -331,7 +331,7 @@ static struct configfs_subsystem sharefs_subsystem = { int get_bid_config(const char *bname) { - return sharefs_bid_get(bname); + return sharefs_appid_get(bname); } int __init sharefs_init_configfs(void) @@ -366,7 +366,7 @@ void sharefs_exit_configfs(void) sharefs_info("sharefs exit configfs"); configfs_unregister_subsystem(&sharefs_subsystem); - clear_bid_hash_entry(); + clear_appid_hash_entry(); kmem_cache_destroy(sharefs_bid_entry_cachep); } \ No newline at end of file -- Gitee