Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 261964c60ff6524076d439da9386d4782729c4d9

Authored by Al Viro
1 parent c765d47903
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

isofs check for NULL ->i_op in root directory is dead code 

for one thing it never happens, for another we check that inode
is a directory right after that place anyway (and we'd already
checked that reading it from disk has not failed).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 0 additions and 6 deletions Side-by-side Diff

... ... @@ -855,10 +855,6 @@
855 855 }
856 856 sbi->s_joliet_level = joliet_level;
857 857  
858   - /* check the root inode */
859   - if (!inode->i_op)
860   - goto out_bad_root;
861   -
862 858 /* Make sure the root inode is a directory */
863 859 if (!S_ISDIR(inode->i_mode)) {
864 860 printk(KERN_WARNING
... ... @@ -886,8 +882,6 @@
886 882 /*
887 883 * Display error messages and free resources.
888 884 */
889   -out_bad_root:
890   - printk(KERN_WARNING "%s: root inode not initialized\n", __func__);
891 885 out_iput:
892 886 iput(inode);
893 887 goto out_no_inode;