diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-12-04 09:57:25 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-01-05 11:53:38 -0500 |
| commit | 261964c60ff6524076d439da9386d4782729c4d9 (patch) | |
| tree | 3186a2d9c09695f1be9c10d3e58e2f0ccc4357c6 | |
| parent | c765d479037808532310212e9b3fa95760e975f2 (diff) | |
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>
| -rw-r--r-- | fs/isofs/inode.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 3f8af0f1505b..6147ec3643a0 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c | |||
| @@ -855,10 +855,6 @@ root_found: | |||
| 855 | } | 855 | } |
| 856 | sbi->s_joliet_level = joliet_level; | 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 | /* Make sure the root inode is a directory */ | 858 | /* Make sure the root inode is a directory */ |
| 863 | if (!S_ISDIR(inode->i_mode)) { | 859 | if (!S_ISDIR(inode->i_mode)) { |
| 864 | printk(KERN_WARNING | 860 | printk(KERN_WARNING |
| @@ -886,8 +882,6 @@ root_found: | |||
| 886 | /* | 882 | /* |
| 887 | * Display error messages and free resources. | 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 | out_iput: | 885 | out_iput: |
| 892 | iput(inode); | 886 | iput(inode); |
| 893 | goto out_no_inode; | 887 | goto out_no_inode; |
