Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d8e9650dff48055057253ca30933605bd7d0733b

Authored by Li Zefan
Committed by Al Viro
1 parent 4c728ef583
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

vfs: remove duplicate code in get_fs_type() 

save 14 bytes:

   text    data     bss     dec     hex filename
   1354      32       4    1390     56e fs/filesystems.o.before
   text    data     bss     dec     hex filename
   1340      32       4    1376     560 fs/filesystems.o

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 13 additions and 10 deletions Side-by-side Diff

... ... @@ -253,24 +253,27 @@
253 253 module_init(proc_filesystems_init);
254 254 #endif
255 255  
256   -struct file_system_type *get_fs_type(const char *name)
  256 +static struct file_system_type *__get_fs_type(const char *name, int len)
257 257 {
258 258 struct file_system_type *fs;
259   - const char *dot = strchr(name, '.');
260   - unsigned len = dot ? dot - name : strlen(name);
261 259  
262 260 read_lock(&file_systems_lock);
263 261 fs = *(find_filesystem(name, len));
264 262 if (fs && !try_module_get(fs->owner))
265 263 fs = NULL;
266 264 read_unlock(&file_systems_lock);
267   - if (!fs && (request_module("%.*s", len, name) == 0)) {
268   - read_lock(&file_systems_lock);
269   - fs = *(find_filesystem(name, len));
270   - if (fs && !try_module_get(fs->owner))
271   - fs = NULL;
272   - read_unlock(&file_systems_lock);
273   - }
  265 + return fs;
  266 +}
  267 +
  268 +struct file_system_type *get_fs_type(const char *name)
  269 +{
  270 + struct file_system_type *fs;
  271 + const char *dot = strchr(name, '.');
  272 + int len = dot ? dot - name : strlen(name);
  273 +
  274 + fs = __get_fs_type(name, len);
  275 + if (!fs && (request_module("%.*s", len, name) == 0))
  276 + fs = __get_fs_type(name, len);
274 277  
275 278 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
276 279 put_filesystem(fs);