Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocfs2: split out inode alloc code from ocfs2_mknod_locked

Browse source 
Do this by splitting the bulk of the function away from the inode allocation
code at the very tom of ocfs2_mknod_locked(). Existing callers don't need to
change and won't see any difference. The new function created,
__ocfs2_mknod_locked() will be used shortly.

Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
This commit is contained in:
Mark Fasheh 2010-08-13 15:15:15 -07:00 committed by Tao Ma
parent 81c8c82b5a
commit 021960cab3
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
fs/ocfs2/namei.c
View file

@ -472,32 +472,23 @@ static int ocfs2_mknod(struct inode *dir,
return status; return status;
} }
static int ocfs2_mknod_locked(struct ocfs2_super *osb, static int __ocfs2_mknod_locked(struct inode *dir,
struct inode *dir, struct inode *inode,
struct inode *inode, dev_t dev,
dev_t dev, struct buffer_head **new_fe_bh,
struct buffer_head **new_fe_bh, struct buffer_head *parent_fe_bh,
struct buffer_head *parent_fe_bh, handle_t *handle,
handle_t *handle, struct ocfs2_alloc_context *inode_ac,
struct ocfs2_alloc_context *inode_ac) u64 fe_blkno, u64 suballoc_loc, u16 suballoc_bit)
{ {
int status = 0; int status = 0;
struct ocfs2_super *osb = OCFS2_SB(dir->i_sb);
struct ocfs2_dinode *fe = NULL; struct ocfs2_dinode *fe = NULL;
struct ocfs2_extent_list *fel; struct ocfs2_extent_list *fel;
u64 suballoc_loc, fe_blkno = 0;
u16 suballoc_bit;
u16 feat; u16 feat;
*new_fe_bh = NULL; *new_fe_bh = NULL;
status = ocfs2_claim_new_inode(handle, dir, parent_fe_bh,
inode_ac, &suballoc_loc,
&suballoc_bit, &fe_blkno);
if (status < 0) {
mlog_errno(status);
goto leave;
}
/* populate as many fields early on as possible - many of /* populate as many fields early on as possible - many of
* these are used by the support functions here and in * these are used by the support functions here and in
* callers. */ * callers. */
@ -591,6 +582,34 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
return status; return status;
} }
static int ocfs2_mknod_locked(struct ocfs2_super *osb,
struct inode *dir,
struct inode *inode,
dev_t dev,
struct buffer_head **new_fe_bh,
struct buffer_head *parent_fe_bh,
handle_t *handle,
struct ocfs2_alloc_context *inode_ac)
{
int status = 0;
u64 suballoc_loc, fe_blkno = 0;
u16 suballoc_bit;
*new_fe_bh = NULL;
status = ocfs2_claim_new_inode(handle, dir, parent_fe_bh,
inode_ac, &suballoc_loc,
&suballoc_bit, &fe_blkno);
if (status < 0) {
mlog_errno(status);
return status;
}
return __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh,
parent_fe_bh, handle, inode_ac,
fe_blkno, suballoc_loc, suballoc_bit);
}
static int ocfs2_mkdir(struct inode *dir, static int ocfs2_mkdir(struct inode *dir,
struct dentry *dentry, struct dentry *dentry,
int mode) int mode)