Commit
30304aba6a053f114092cea6643a96ac2902bc5a
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
switch sysv
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing
2 changed files
with
4 additions
and
5 deletions
Side-by-side Diff
| ... |
... |
@@ -48,7 +48,6 @@ |
|
48
|
48 |
struct inode * inode = NULL; |
|
49
|
49 |
ino_t ino; |
|
50
|
50 |
|
|
51
|
|
- d_set_d_op(dentry, dir->i_sb->s_root->d_op); |
|
52
|
51 |
if (dentry->d_name.len > SYSV_NAMELEN) |
|
53
|
52 |
return ERR_PTR(-ENAMETOOLONG); |
|
54
|
53 |
ino = sysv_inode_by_name(dentry); |
| ... |
... |
@@ -332,6 +332,10 @@ |
|
332
|
332 |
sb->s_magic = SYSV_MAGIC_BASE + sbi->s_type; |
|
333
|
333 |
/* set up enough so that it can read an inode */ |
|
334
|
334 |
sb->s_op = &sysv_sops; |
|
|
335 |
+ if (sbi->s_forced_ro) |
|
|
336 |
+ sb->s_flags |= MS_RDONLY; |
|
|
337 |
+ if (sbi->s_truncate) |
|
|
338 |
+ sb->s_d_op = &sysv_dentry_operations; |
|
335
|
339 |
root_inode = sysv_iget(sb, SYSV_ROOT_INO); |
|
336
|
340 |
if (IS_ERR(root_inode)) { |
|
337
|
341 |
printk("SysV FS: get root inode failed\n"); |
| ... |
... |
@@ -343,10 +347,6 @@ |
|
343
|
347 |
printk("SysV FS: get root dentry failed\n"); |
|
344
|
348 |
return 0; |
|
345
|
349 |
} |
|
346
|
|
- if (sbi->s_forced_ro) |
|
347
|
|
- sb->s_flags |= MS_RDONLY; |
|
348
|
|
- if (sbi->s_truncate) |
|
349
|
|
- d_set_d_op(sb->s_root, &sysv_dentry_operations); |
|
350
|
350 |
return 1; |
|
351
|
351 |
} |
|
352
|
352 |
|
