mirror of
https://github.com/torvalds/linux.git
synced 2024-10-24 14:10:59 +00:00
Merge branch 'no-rebase-overlayfs' into work.dcache-misc
This commit is contained in:
commit
b33c14c861
|
@ -289,7 +289,6 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,
|
|||
{
|
||||
struct dentry *lower = lowerpath ? lowerpath->dentry : NULL;
|
||||
struct dentry *upper = upper_alias ?: index;
|
||||
struct dentry *dentry;
|
||||
struct inode *inode = NULL;
|
||||
struct ovl_entry *oe;
|
||||
struct ovl_inode_params oip = {
|
||||
|
@ -320,27 +319,7 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,
|
|||
if (upper)
|
||||
ovl_set_flag(OVL_UPPERDATA, inode);
|
||||
|
||||
dentry = d_find_any_alias(inode);
|
||||
if (dentry)
|
||||
goto out_iput;
|
||||
|
||||
dentry = d_alloc_anon(inode->i_sb);
|
||||
if (unlikely(!dentry))
|
||||
goto nomem;
|
||||
|
||||
if (upper_alias)
|
||||
ovl_dentry_set_upper_alias(dentry);
|
||||
|
||||
ovl_dentry_init_reval(dentry, upper, OVL_I_E(inode));
|
||||
|
||||
return d_instantiate_anon(dentry, inode);
|
||||
|
||||
nomem:
|
||||
dput(dentry);
|
||||
dentry = ERR_PTR(-ENOMEM);
|
||||
out_iput:
|
||||
iput(inode);
|
||||
return dentry;
|
||||
return d_obtain_alias(inode);
|
||||
}
|
||||
|
||||
/* Get the upper or lower dentry in stack whose on layer @idx */
|
||||
|
|
Loading…
Reference in New Issue
Block a user