isofs check for NULL ->i_op in root directory is dead code (261964c6) · Commits · 戴 / test

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>

fs/isofs/inode.c

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -855,10 +855,6 @@ root_found:
	}		}
	sbi->s_joliet_level = joliet_level;		sbi->s_joliet_level = joliet_level;

	/* check the root inode */
	if (!inode->i_op)
	goto out_bad_root;

	/* Make sure the root inode is a directory */		/* Make sure the root inode is a directory */
	if (!S_ISDIR(inode->i_mode)) {		if (!S_ISDIR(inode->i_mode)) {
	printk(KERN_WARNING		printk(KERN_WARNING
	@@ -886,8 +882,6 @@ root_found:
	/*		/*
	* Display error messages and free resources.		* Display error messages and free resources.
	*/		*/
	out_bad_root:
	printk(KERN_WARNING "%s: root inode not initialized\n", __func__);
	out_iput:		out_iput:
	iput(inode);		iput(inode);
	goto out_no_inode;		goto out_no_inode;

Admin message