lkml.org 
[lkml]   [2007]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/31] IGET: Stop ISOFS from using read_inode() [try #3]
    Date
    Stop the ISOFS filesystem from using read_inode().  Make isofs_read_inode()
    return an error code, and make isofs_iget() pass it on.

    Signed-off-by: David Howells <dhowells@redhat.com>
    ---

    fs/isofs/inode.c | 25 +++++++++++++++++--------
    1 files changed, 17 insertions(+), 8 deletions(-)

    diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
    index 043b470..28d990b 100644
    --- a/fs/isofs/inode.c
    +++ b/fs/isofs/inode.c
    @@ -54,7 +54,7 @@ static void isofs_put_super(struct super_block *sb)
    return;
    }

    -static void isofs_read_inode(struct inode *);
    +static int isofs_read_inode(struct inode *);
    static int isofs_statfs (struct dentry *, struct kstatfs *);

    static struct kmem_cache *isofs_inode_cachep;
    @@ -107,7 +107,6 @@ static int isofs_remount(struct super_block *sb, int *flags, char *data)
    static const struct super_operations isofs_sops = {
    .alloc_inode = isofs_alloc_inode,
    .destroy_inode = isofs_destroy_inode,
    - .read_inode = isofs_read_inode,
    .put_super = isofs_put_super,
    .statfs = isofs_statfs,
    .remount_fs = isofs_remount,
    @@ -1186,7 +1185,7 @@ out_toomany:
    goto out;
    }

    -static void isofs_read_inode(struct inode *inode)
    +static int isofs_read_inode(struct inode *inode)
    {
    struct super_block *sb = inode->i_sb;
    struct isofs_sb_info *sbi = ISOFS_SB(sb);
    @@ -1199,6 +1198,7 @@ static void isofs_read_inode(struct inode *inode)
    unsigned int de_len;
    unsigned long offset;
    struct iso_inode_info *ei = ISOFS_I(inode);
    + int ret = -EIO;

    block = ei->i_iget5_block;
    bh = sb_bread(inode->i_sb, block);
    @@ -1216,6 +1216,7 @@ static void isofs_read_inode(struct inode *inode)
    tmpde = kmalloc(de_len, GFP_KERNEL);
    if (tmpde == NULL) {
    printk(KERN_INFO "%s: out of memory\n", __func__);
    + ret = -ENOMEM;
    goto fail;
    }
    memcpy(tmpde, bh->b_data + offset, frag1);
    @@ -1259,8 +1260,10 @@ static void isofs_read_inode(struct inode *inode)

    ei->i_section_size = isonum_733(de->size);
    if (de->flags[-high_sierra] & 0x80) {
    - if(isofs_read_level3_size(inode))
    + ret = isofs_read_level3_size(inode);
    + if (ret < 0)
    goto fail;
    + ret = -EIO;
    } else {
    ei->i_next_section_block = 0;
    ei->i_next_section_offset = 0;
    @@ -1346,16 +1349,16 @@ static void isofs_read_inode(struct inode *inode)
    /* XXX - parse_rock_ridge_inode() had already set i_rdev. */
    init_special_inode(inode, inode->i_mode, inode->i_rdev);

    + ret = 0;
    out:
    kfree(tmpde);
    if (bh)
    brelse(bh);
    - return;
    + return ret;

    out_badread:
    printk(KERN_WARNING "ISOFS: unable to read i-node block\n");
    fail:
    - make_bad_inode(inode);
    goto out;
    }

    @@ -1394,6 +1397,7 @@ struct inode *isofs_iget(struct super_block *sb,
    unsigned long hashval;
    struct inode *inode;
    struct isofs_iget5_callback_data data;
    + long ret;

    if (offset >= 1ul << sb->s_blocksize_bits)
    return NULL;
    @@ -1407,8 +1411,13 @@ struct inode *isofs_iget(struct super_block *sb,
    &isofs_iget5_set, &data);

    if (inode && (inode->i_state & I_NEW)) {
    - sb->s_op->read_inode(inode);
    - unlock_new_inode(inode);
    + ret = isofs_read_inode(inode);
    + if (ret < 0) {
    + iget_failed(inode);
    + inode = ERR_PTR(ret);
    + } else {
    + unlock_new_inode(inode);
    + }
    }

    return inode;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-10-11 00:25    [W:1.818 / U:29.596 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site