ovl: cleanup setting OVL_INDEX
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
parent
102b0d11cb
commit
0471a9cdb0
|
@ -311,9 +311,6 @@ static struct dentry *ovl_obtain_alias(struct super_block *sb,
|
||||||
return ERR_CAST(inode);
|
return ERR_CAST(inode);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (index)
|
|
||||||
ovl_set_flag(OVL_INDEX, inode);
|
|
||||||
|
|
||||||
dentry = d_find_any_alias(inode);
|
dentry = d_find_any_alias(inode);
|
||||||
if (!dentry) {
|
if (!dentry) {
|
||||||
dentry = d_alloc_anon(inode->i_sb);
|
dentry = d_alloc_anon(inode->i_sb);
|
||||||
|
|
|
@ -770,6 +770,9 @@ struct inode *ovl_get_inode(struct super_block *sb, struct dentry *upperdentry,
|
||||||
if (upperdentry && ovl_is_impuredir(upperdentry))
|
if (upperdentry && ovl_is_impuredir(upperdentry))
|
||||||
ovl_set_flag(OVL_IMPURE, inode);
|
ovl_set_flag(OVL_IMPURE, inode);
|
||||||
|
|
||||||
|
if (index)
|
||||||
|
ovl_set_flag(OVL_INDEX, inode);
|
||||||
|
|
||||||
/* Check for non-merge dir that may have whiteouts */
|
/* Check for non-merge dir that may have whiteouts */
|
||||||
if (is_dir) {
|
if (is_dir) {
|
||||||
if (((upperdentry && lowerdentry) || numlower > 1) ||
|
if (((upperdentry && lowerdentry) || numlower > 1) ||
|
||||||
|
|
|
@ -1007,8 +1007,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
|
||||||
goto out_free_oe;
|
goto out_free_oe;
|
||||||
|
|
||||||
OVL_I(inode)->redirect = upperredirect;
|
OVL_I(inode)->redirect = upperredirect;
|
||||||
if (index)
|
|
||||||
ovl_set_flag(OVL_INDEX, inode);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
revert_creds(old_cred);
|
revert_creds(old_cred);
|
||||||
|
|
Loading…
Reference in New Issue