Skip to contentSkip to conversation

fs/9p: replace functions v9fs_cache_{register|unregister} with direct calls

PATCH In review Colin Ian King 3 participants 4 messages Nov 7, 2024 – Nov 16, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fs/9p: replace functions v9fs_cache_{register|unregister} with direct calls

The helper functions v9fs_cache_register and v9fs_cache_unregister are trivial helper functions that don't offer any extra functionality and are unncessary. Replace them with direct calls to v9fs_init_inode_cache and v9fs_destroy_inode_cache respectively to simplify the code.

---

V1: originally cleaned up v9fs_cache_register to just a direct call
to v9fs_init_inode_cache.
V2: replace v9fs_cache_register and v9fs_cache_unregister with direct
calls and change subject line

---
 fs/9p/v9fs.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
fs/9p/v9fs.c +3 -18
index 281a1ed03a04..77e9c4387c1d 100644
@@ -659,21 +659,6 @@ static void v9fs_destroy_inode_cache(void)
 	kmem_cache_destroy(v9fs_inode_cache);
 }
 
-static int v9fs_cache_register(void)
-{
-	int ret;
-
-	ret = v9fs_init_inode_cache();
-	if (ret < 0)
-		return ret;
-	return ret;
-}
-
-static void v9fs_cache_unregister(void)
-{
-	v9fs_destroy_inode_cache();
-}
-
 /**
  * init_v9fs - Initialize module
  *
@@ -686,7 +671,7 @@ static int __init init_v9fs(void)
 	pr_info("Installing v9fs 9p2000 file system support\n");
 	/* TODO: Setup list of registered trasnport modules */
 
-	err = v9fs_cache_register();
+	err = v9fs_init_inode_cache();
 	if (err < 0) {
 		pr_err("Failed to register v9fs for caching\n");
 		return err;
@@ -709,7 +694,7 @@ static int __init init_v9fs(void)
 	v9fs_sysfs_cleanup();
 
 out_cache:
-	v9fs_cache_unregister();
+	v9fs_destroy_inode_cache();
 
 	return err;
 }
@@ -722,7 +707,7 @@ static int __init init_v9fs(void)
 static void __exit exit_v9fs(void)
 {
 	v9fs_sysfs_cleanup();
-	v9fs_cache_unregister();
+	v9fs_destroy_inode_cache();
 	unregister_filesystem(&v9fs_fs_type);
 }
 
Signature · 1 line
2.39.5
maintainer Acked-by on v2 1/1
#1 lore raw

Colin Ian King wrote on Thu, Nov 07, 2024 at 09:57:56AM +0000:

Quoted 6 lines

The helper functions v9fs_cache_register and v9fs_cache_unregister are trivial helper functions that don't offer any extra functionality and are unncessary. Replace them with direct calls to v9fs_init_inode_cache and v9fs_destroy_inode_cache respectively to simplify the code.

Thanks!

@Dan, I don't have anything queued up 9p-wise so if you want to take it through the janitor tree it'll probably get in faster; otherwise (if you'd rather I take it or no reply in a while) I'll pick it up when other patches come in.

Signature · 1 line
Dominique
#2 lore raw
Quoted 10 lines · Dominique Martinet

Colin Ian King wrote on Thu, Nov 07, 2024 at 09:57:56AM +0000:

Quoted 6 lines

The helper functions v9fs_cache_register and v9fs_cache_unregister are trivial helper functions that don't offer any extra functionality and are unncessary. Replace them with direct calls to v9fs_init_inode_cache and v9fs_destroy_inode_cache respectively to simplify the code.

Thanks!

Quoted 7 lines

@Dan, I don't have anything queued up 9p-wise so if you want to take it through the janitor tree it'll probably get in faster; otherwise (if you'd rather I take it or no reply in a while) I'll pick it up when other patches come in.

There isn't a janitor tree or any rush on this. ;)

regards,
dan carpenter

#3 lore raw

Dan Carpenter wrote on Thu, Nov 07, 2024 at 04:56:55PM +0300:

Quoted 7 lines · Dominique Martinet
Quoted 4 lines

@Dan, I don't have anything queued up 9p-wise so if you want to take it through the janitor tree it'll probably get in faster; otherwise (if you'd rather I take it or no reply in a while) I'll pick it up when other patches come in.

There isn't a janitor tree or any rush on this. ;)

Sorry, I was somehow convinced you had a tree somewhere.

I've now taken it in 9p-next, will pobably submit it for next cycle.

Thanks,

Signature · 1 line
Dominique Martinet | Asmadeus