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 09/31] IGET: Stop BFS from using iget() and read_inode() [try #3]
    Date
    Stop the BFS filesystem from using iget() and read_inode().  Replace
    bfs_read_inode() with bfs_iget(), and call that instead of iget().
    bfs_iget() then uses iget_locked() directly and returns a proper error code
    instead of an inode in the event of an error.

    bfs_fill_super() returns any error incurred when getting the root inode
    instead of EINVAL.

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

    fs/bfs/bfs.h | 2 ++
    fs/bfs/dir.c | 6 +++---
    fs/bfs/inode.c | 32 ++++++++++++++++++++++----------
    3 files changed, 27 insertions(+), 13 deletions(-)

    diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h
    index 130f6c6..5cf50d4 100644
    --- a/fs/bfs/bfs.h
    +++ b/fs/bfs/bfs.h
    @@ -46,6 +46,8 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode)
    #define printf(format, args...) \
    printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args)

    +/* inode.c */
    +extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino);

    /* file.c */
    extern const struct inode_operations bfs_file_inops;
    diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
    index 097f149..03c8bdb 100644
    --- a/fs/bfs/dir.c
    +++ b/fs/bfs/dir.c
    @@ -141,10 +141,10 @@ static struct dentry * bfs_lookup(struct inode * dir, struct dentry * dentry, st
    if (bh) {
    unsigned long ino = (unsigned long)le16_to_cpu(de->ino);
    brelse(bh);
    - inode = iget(dir->i_sb, ino);
    - if (!inode) {
    + inode = bfs_iget(dir->i_sb, ino);
    + if (IS_ERR(inode)) {
    unlock_kernel();
    - return ERR_PTR(-EACCES);
    + return ERR_CAST(inode);
    }
    }
    unlock_kernel();
    diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
    index f346eb1..76798c9 100644
    --- a/fs/bfs/inode.c
    +++ b/fs/bfs/inode.c
    @@ -32,25 +32,29 @@ MODULE_LICENSE("GPL");

    void dump_imap(const char *prefix, struct super_block * s);

    -static void bfs_read_inode(struct inode * inode)
    +struct inode *bfs_iget(struct super_block *sb, unsigned long ino)
    {
    - unsigned long ino = inode->i_ino;
    struct bfs_inode * di;
    struct buffer_head * bh;
    + struct inode *inode;
    int block, off;

    + inode = iget_locked(sb, ino);
    + if (IS_ERR(inode))
    + return ERR_PTR(-ENOMEM);
    + if (!(inode->i_state & I_NEW))
    + return inode;
    +
    if (ino < BFS_ROOT_INO || ino > BFS_SB(inode->i_sb)->si_lasti) {
    printf("Bad inode number %s:%08lx\n", inode->i_sb->s_id, ino);
    - make_bad_inode(inode);
    - return;
    + goto error;
    }

    block = (ino - BFS_ROOT_INO)/BFS_INODES_PER_BLOCK + 1;
    bh = sb_bread(inode->i_sb, block);
    if (!bh) {
    printf("Unable to read inode %s:%08lx\n", inode->i_sb->s_id, ino);
    - make_bad_inode(inode);
    - return;
    + goto error;
    }

    off = (ino - BFS_ROOT_INO) % BFS_INODES_PER_BLOCK;
    @@ -85,6 +89,12 @@ static void bfs_read_inode(struct inode * inode)
    BFS_I(inode)->i_dsk_ino = le16_to_cpu(di->i_ino); /* can be 0 so we store a copy */

    brelse(bh);
    + unlock_new_inode(inode);
    + return inode;
    +
    +error:
    + iget_failed(inode);
    + return ERR_PTR(-EIO);
    }

    static int bfs_write_inode(struct inode * inode, int unused)
    @@ -271,7 +281,6 @@ static void destroy_inodecache(void)
    static const struct super_operations bfs_sops = {
    .alloc_inode = bfs_alloc_inode,
    .destroy_inode = bfs_destroy_inode,
    - .read_inode = bfs_read_inode,
    .write_inode = bfs_write_inode,
    .delete_inode = bfs_delete_inode,
    .put_super = bfs_put_super,
    @@ -306,6 +315,7 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
    struct inode * inode;
    unsigned i, imap_len;
    struct bfs_sb_info * info;
    + long ret = -EINVAL;

    info = kzalloc(sizeof(*info), GFP_KERNEL);
    if (!info)
    @@ -340,14 +350,16 @@ static int bfs_fill_super(struct super_block *s, void *data, int silent)
    set_bit(i, info->si_imap);

    s->s_op = &bfs_sops;
    - inode = iget(s, BFS_ROOT_INO);
    - if (!inode) {
    + inode = bfs_iget(s, BFS_ROOT_INO);
    + if (IS_ERR(inode)) {
    + ret = PTR_ERR(inode);
    kfree(info->si_imap);
    goto out;
    }
    s->s_root = d_alloc_root(inode);
    if (!s->s_root) {
    iput(inode);
    + ret = -ENOMEM;
    kfree(info->si_imap);
    goto out;
    }
    @@ -402,7 +414,7 @@ out:
    brelse(bh);
    kfree(info);
    s->s_fs_info = NULL;
    - return -EINVAL;
    + return ret;
    }

    static int bfs_get_sb(struct file_system_type *fs_type,
    -
    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:0.029 / U:64.152 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site