kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/fs/orangefs/orangefs-mod.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * (C) 2001 Clemson University and The University of Chicago
3
4
  *
..
..
@@ -30,10 +31,12 @@
30
31
 __u64 orangefs_gossip_debug_mask;
31
32
 int op_timeout_secs = ORANGEFS_DEFAULT_OP_TIMEOUT_SECS;
32
33
 int slot_timeout_secs = ORANGEFS_DEFAULT_SLOT_TIMEOUT_SECS;
34
+int orangefs_cache_timeout_msecs = 50;
33
35
 int orangefs_dcache_timeout_msecs = 50;
34
36
 int orangefs_getattr_timeout_msecs = 50;
35
37
 
36
38
 MODULE_LICENSE("GPL");
39
+MODULE_IMPORT_NS(ANDROID_GKI_VFS_EXPORT_ONLY);
37
40
 MODULE_AUTHOR("ORANGEFS Development Team");
38
41
 MODULE_DESCRIPTION("The Linux Kernel VFS interface to ORANGEFS");
39
42
 MODULE_PARM_DESC(module_parm_debug_mask, "debugging level (see orangefs-debug.h for values)");
..
..
@@ -77,7 +80,7 @@
77
80
 
78
81
 static int __init orangefs_init(void)
79
82
 {
80
-	int ret = -1;
83
+	int ret;
81
84
 	__u32 i = 0;
82
85
 
83
86
 	if (op_timeout_secs < 0)
..
..
@@ -127,9 +130,7 @@
127
130
 	if (ret)
128
131
 		goto cleanup_key_table;
129
132
 
130
-	ret = orangefs_debugfs_init(module_parm_debug_mask);
131
-	if (ret)
132
-		goto debugfs_init_failed;
133
+	orangefs_debugfs_init(module_parm_debug_mask);
133
134
 
134
135
 	ret = orangefs_sysfs_init();
135
136
 	if (ret)
..
..
@@ -149,7 +150,6 @@
149
150
 		pr_info("%s: module version %s loaded\n",
150
151
 			__func__,
151
152
 			ORANGEFS_VERSION);
152
-		ret = 0;
153
153
 		goto out;
154
154
 	}
155
155
 
..
..
@@ -159,8 +159,6 @@
159
159
 	orangefs_dev_cleanup();
160
160
 
161
161
 sysfs_init_failed:
162
-
163
-debugfs_init_failed:
164
162
 	orangefs_debugfs_cleanup();
165
163
 
166
164
 cleanup_key_table: