Skip to content

Commit

Permalink
exofs: refactor exofs_i_info initialization into common helper
Browse files Browse the repository at this point in the history
There are two places that initialize inodes: exofs_iget() and
exofs_new_inode()

As more members of exofs_i_info that need initialization are
added this code will grow. (soon)

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
  • Loading branch information
Boaz Harrosh committed Dec 10, 2009
1 parent fe33cc1 commit 9cfdc7a
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions fs/exofs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -908,6 +908,12 @@ static int exofs_get_inode(struct super_block *sb, struct exofs_i_info *oi,
return ret;
}


static void __oi_init(struct exofs_i_info *oi)
{
init_waitqueue_head(&oi->i_wq);
oi->i_flags = 0;
}
/*
* Fill in an inode read from the OSD and set it up for use
*/
Expand All @@ -925,13 +931,13 @@ struct inode *exofs_iget(struct super_block *sb, unsigned long ino)
if (!(inode->i_state & I_NEW))
return inode;
oi = exofs_i(inode);
__oi_init(oi);

/* read the inode from the osd */
ret = exofs_get_inode(sb, oi, &fcb, &sanity);
if (ret)
goto bad_inode;

init_waitqueue_head(&oi->i_wq);
set_obj_created(oi);

/* copy stuff from on-disk struct to in-memory struct */
Expand Down Expand Up @@ -1062,8 +1068,8 @@ struct inode *exofs_new_inode(struct inode *dir, int mode)
return ERR_PTR(-ENOMEM);

oi = exofs_i(inode);
__oi_init(oi);

init_waitqueue_head(&oi->i_wq);
set_obj_2bcreated(oi);

sbi = sb->s_fs_info;
Expand Down

0 comments on commit 9cfdc7a

Please sign in to comment.