> diff --git a/fs/ext3/ialloc.c b/fs/ext3/ialloc.c
> index e45dbd6..c2f0a0d 100644
> --- a/fs/ext3/ialloc.c
> +++ b/fs/ext3/ialloc.c
> @@ -646,7 +646,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino)
> unsigned long block_group;
> int bit;
> struct buffer_head *bitmap_bh = NULL;
> - struct inode *inode = NULL;
> + struct inode *inode = ERR_PTR(-EIO);
>
> /* Error cases - e2fsck has already cleaned up for us */
> if (ino > max_ino) {
> @@ -668,9 +668,14 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino)
> * is a valid orphan (no e2fsck run on fs). Orphans also include
> * inodes that were being truncated, so we can't check i_nlink==0.
> */
> - if (!ext3_test_bit(bit, bitmap_bh->b_data) ||
> - !(inode = iget(sb, ino)) || is_bad_inode(inode) ||
> - NEXT_ORPHAN(inode) > max_ino) {
> + if (ext3_test_bit(bit, bitmap_bh->b_data))
> + goto out;
> +
> + inode = ext3_iget(sb, ino);
> + if (IS_ERR(inode))
> + goto out;
> +
> + if (NEXT_ORPHAN(inode) > max_ino) {
> ext3_warning(sb, __FUNCTION__,
> "bad orphan inode %lu! e2fsck was run?", ino);
> printk(KERN_NOTICE "ext3_test_bit(bit=%d, block=%llu) = %d\n",
But if you 'goto out' in some branches, we loose the ext3_warning()
which we probably don't want.
> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> index c1fa190..78bfab5 100644
> --- a/fs/ext3/namei.c
> +++ b/fs/ext3/namei.c
> @@ -1046,17 +1046,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);
Wouldn't here -EIO be more appropriate?
> @@ -1085,18 +1079,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);
And similarly here...
> @@ -1415,6 +1413,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> int db_count;
> int i;
> int needs_recovery;
> + int ret = -EINVAL;
> __le32 features;
>
> sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
> @@ -1770,19 +1769,25 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> * so we can safely mount the rest of the filesystem now.
> */
>
> - root = iget(sb, EXT3_ROOT_INO);
> - sb->s_root = d_alloc_root(root);
> - if (!sb->s_root) {
> + root = ext3_iget(sb, EXT3_ROOT_INO);
> + if (IS_ERR(root)) {
> printk(KERN_ERR "EXT3-fs: get root inode failed\n");
> - iput(root);
> + if (PTR_ERR(root) == -ENOMEM)
> + ret = -ENOMEM;
Why don't we use PTR_ERR() always? Is there some reason not to return
-EIO?
Honza
--
Jan Kara <[email protected]>
SuSE CR Labs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
