ovl: move some common code in a function
ovl_create_upper() and ovl_create_over_whiteout() seem to be sharing some common code which can be moved into a separate function. No functionality change. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Родитель
58ed4e70f2
Коммит
72e4848181
|
@ -158,6 +158,16 @@ static int ovl_dir_getattr(struct vfsmount *mnt, struct dentry *dentry,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Common operations required to be done after creation of file on upper */
|
||||||
|
static void ovl_instantiate(struct dentry *dentry, struct inode *inode,
|
||||||
|
struct dentry *newdentry)
|
||||||
|
{
|
||||||
|
ovl_dentry_version_inc(dentry->d_parent);
|
||||||
|
ovl_dentry_update(dentry, newdentry);
|
||||||
|
ovl_copyattr(newdentry->d_inode, inode);
|
||||||
|
d_instantiate(dentry, inode);
|
||||||
|
}
|
||||||
|
|
||||||
static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
|
static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
|
||||||
struct kstat *stat, const char *link,
|
struct kstat *stat, const char *link,
|
||||||
struct dentry *hardlink)
|
struct dentry *hardlink)
|
||||||
|
@ -177,10 +187,7 @@ static int ovl_create_upper(struct dentry *dentry, struct inode *inode,
|
||||||
if (err)
|
if (err)
|
||||||
goto out_dput;
|
goto out_dput;
|
||||||
|
|
||||||
ovl_dentry_version_inc(dentry->d_parent);
|
ovl_instantiate(dentry, inode, newdentry);
|
||||||
ovl_dentry_update(dentry, newdentry);
|
|
||||||
ovl_copyattr(newdentry->d_inode, inode);
|
|
||||||
d_instantiate(dentry, inode);
|
|
||||||
newdentry = NULL;
|
newdentry = NULL;
|
||||||
out_dput:
|
out_dput:
|
||||||
dput(newdentry);
|
dput(newdentry);
|
||||||
|
@ -363,10 +370,7 @@ static int ovl_create_over_whiteout(struct dentry *dentry, struct inode *inode,
|
||||||
if (err)
|
if (err)
|
||||||
goto out_cleanup;
|
goto out_cleanup;
|
||||||
}
|
}
|
||||||
ovl_dentry_version_inc(dentry->d_parent);
|
ovl_instantiate(dentry, inode, newdentry);
|
||||||
ovl_dentry_update(dentry, newdentry);
|
|
||||||
ovl_copyattr(newdentry->d_inode, inode);
|
|
||||||
d_instantiate(dentry, inode);
|
|
||||||
newdentry = NULL;
|
newdentry = NULL;
|
||||||
out_dput2:
|
out_dput2:
|
||||||
dput(upper);
|
dput(upper);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче