lkml.org 
[lkml]   [2007]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/32] IGET: Stop CIFS from using iget() and read_inode() [try #2]
    Date
    Stop the CIFS filesystem from using iget() and read_inode().  Replace
    cifs_read_inode() with cifs_iget(), and call that instead of iget().
    cifs_iget() then uses iget_locked() directly and returns a proper error code
    instead of an inode in the event of an error.

    cifs_read_super() now returns any error incurred when getting the root inode
    instead of ENOMEM.

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

    fs/cifs/cifsfs.c | 8 ++++----
    fs/cifs/cifsfs.h | 1 +
    fs/cifs/inode.c | 35 ++++++++++++++++++++++++++---------
    3 files changed, 31 insertions(+), 13 deletions(-)

    diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
    index cabb6a5..1cb13f5 100644
    --- a/fs/cifs/cifsfs.c
    +++ b/fs/cifs/cifsfs.c
    @@ -126,10 +126,11 @@ cifs_read_super(struct super_block *sb, void *data,
    #endif
    sb->s_blocksize = CIFS_MAX_MSGSIZE;
    sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */
    - inode = iget(sb, ROOT_I);
    + inode = cifs_iget(sb, ROOT_I);

    - if (!inode) {
    - rc = -ENOMEM;
    + if (IS_ERR(inode)) {
    + rc = PTR_ERR(inode);
    + inode = NULL;
    goto out_no_root;
    }

    @@ -481,7 +482,6 @@ static int cifs_remount(struct super_block *sb, int *flags, char *data)
    }

    static const struct super_operations cifs_super_ops = {
    - .read_inode = cifs_read_inode,
    .put_super = cifs_put_super,
    .statfs = cifs_statfs,
    .alloc_inode = cifs_alloc_inode,
    diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
    index a20de77..74a3190 100644
    --- a/fs/cifs/cifsfs.h
    +++ b/fs/cifs/cifsfs.h
    @@ -43,6 +43,7 @@ extern void cifs_read_inode(struct inode *);

    /* Functions related to inodes */
    extern const struct inode_operations cifs_dir_inode_ops;
    +extern struct inode *cifs_iget(struct super_block *, unsigned long);
    extern int cifs_create(struct inode *, struct dentry *, int,
    struct nameidata *);
    extern struct dentry *cifs_lookup(struct inode *, struct dentry *,
    diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
    index dd41677..48966b9 100644
    --- a/fs/cifs/inode.c
    +++ b/fs/cifs/inode.c
    @@ -576,20 +576,37 @@ int cifs_get_inode_info(struct inode **pinode,
    }

    /* gets root inode */
    -void cifs_read_inode(struct inode *inode)
    +struct inode *cifs_iget(struct super_block *sb, unsigned long ino)
    {
    int xid;
    struct cifs_sb_info *cifs_sb;
    + struct inode *inode;
    + long ret;

    - cifs_sb = CIFS_SB(inode->i_sb);
    - xid = GetXid();
    + inode = iget_locked(sb, ino);
    + if (!inode)
    + return ERR_PTR(-ENOMEM);
    + if (inode->i_state & I_NEW) {
    + cifs_sb = CIFS_SB(inode->i_sb);
    + xid = GetXid();

    - if (cifs_sb->tcon->unix_ext)
    - cifs_get_inode_info_unix(&inode, "", inode->i_sb, xid);
    - else
    - cifs_get_inode_info(&inode, "", NULL, inode->i_sb, xid);
    - /* can not call macro FreeXid here since in a void func */
    - _FreeXid(xid);
    + if (cifs_sb->tcon->unix_ext)
    + ret = cifs_get_inode_info_unix(&inode, "", inode->i_sb,
    + xid);
    + else
    + ret = cifs_get_inode_info(&inode, "", NULL, inode->i_sb,
    + xid);
    + /* can not call macro FreeXid here since in a void func */
    + _FreeXid(xid);
    + if (ret < 0) {
    + iget_failed(inode);
    + inode = ERR_PTR(ret);
    + } else {
    + unlock_new_inode(inode);
    + }
    + }
    +
    + return inode;
    }

    int cifs_unlink(struct inode *inode, struct dentry *direntry)
    -
    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-04 18:05    [W:0.041 / U:90.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site