iget: stop EXT3 from using iget() and read_inode()
Stop the EXT3 filesystem from using iget() and read_inode(). Replace ext3_read_inode() with ext3_iget(), and call that instead of iget(). ext3_iget() then uses iget_locked() directly and returns a proper error code instead of an inode in the event of an error. ext3_fill_super() returns any error incurred when getting the root inode instead of EINVAL. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu> Acked-by: Jan Kara <jack@suse.cz> Cc: <linux-ext4@vger.kernel.org> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
52fcf70329
commit
473043dcee
@@ -1037,17 +1037,11 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str
|
||||
if (!ext3_valid_inum(dir->i_sb, ino)) {
|
||||
ext3_error(dir->i_sb, "ext3_lookup",
|
||||
"bad inode number: %lu", ino);
|
||||
inode = NULL;
|
||||
} else
|
||||
inode = iget(dir->i_sb, ino);
|
||||
|
||||
if (!inode)
|
||||
return ERR_PTR(-EACCES);
|
||||
|
||||
if (is_bad_inode(inode)) {
|
||||
iput(inode);
|
||||
return ERR_PTR(-ENOENT);
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
inode = ext3_iget(dir->i_sb, ino);
|
||||
if (IS_ERR(inode))
|
||||
return ERR_CAST(inode);
|
||||
}
|
||||
return d_splice_alias(inode, dentry);
|
||||
}
|
||||
@@ -1076,18 +1070,13 @@ struct dentry *ext3_get_parent(struct dentry *child)
|
||||
if (!ext3_valid_inum(child->d_inode->i_sb, ino)) {
|
||||
ext3_error(child->d_inode->i_sb, "ext3_get_parent",
|
||||
"bad inode number: %lu", ino);
|
||||
inode = NULL;
|
||||
} else
|
||||
inode = iget(child->d_inode->i_sb, ino);
|
||||
|
||||
if (!inode)
|
||||
return ERR_PTR(-EACCES);
|
||||
|
||||
if (is_bad_inode(inode)) {
|
||||
iput(inode);
|
||||
return ERR_PTR(-ENOENT);
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
|
||||
inode = ext3_iget(child->d_inode->i_sb, ino);
|
||||
if (IS_ERR(inode))
|
||||
return ERR_CAST(inode);
|
||||
|
||||
parent = d_alloc_anon(inode);
|
||||
if (!parent) {
|
||||
iput(inode);
|
||||
|
Reference in New Issue
Block a user