Commit 9436a1a3 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi

ovl: decode lower file handles of unlinked but open files

Lookup overlay inode in cache by origin inode, so we can decode a file
handle of an open file even if the index has a whiteout index entry to
mark this overlay inode was unlinked.
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent f71bd9cf
...@@ -443,14 +443,22 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, ...@@ -443,14 +443,22 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb,
struct ovl_path *stack = &origin; struct ovl_path *stack = &origin;
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
struct dentry *index = NULL; struct dentry *index = NULL;
struct inode *inode = NULL;
bool is_deleted = false;
int err; int err;
/* First lookup indexed upper by fh */ /* First lookup indexed upper by fh */
if (ofs->indexdir) { if (ofs->indexdir) {
index = ovl_get_index_fh(ofs, fh); index = ovl_get_index_fh(ofs, fh);
err = PTR_ERR(index); err = PTR_ERR(index);
if (IS_ERR(index)) if (IS_ERR(index)) {
if (err != -ESTALE)
return ERR_PTR(err); return ERR_PTR(err);
/* Found a whiteout index - treat as deleted inode */
is_deleted = true;
index = NULL;
}
} }
/* Then lookup origin by fh */ /* Then lookup origin by fh */
...@@ -461,6 +469,16 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, ...@@ -461,6 +469,16 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb,
err = ovl_verify_origin(index, origin.dentry, false); err = ovl_verify_origin(index, origin.dentry, false);
if (err) if (err)
goto out_err; goto out_err;
} else if (is_deleted) {
/* Lookup deleted non-dir by origin inode */
if (!d_is_dir(origin.dentry))
inode = ovl_lookup_inode(sb, origin.dentry);
err = -ESTALE;
if (!inode || atomic_read(&inode->i_count) == 1)
goto out_err;
/* Deleted but still open? */
index = dget(ovl_i_dentry_upper(inode));
} }
dentry = ovl_get_dentry(sb, NULL, &origin, index); dentry = ovl_get_dentry(sb, NULL, &origin, index);
...@@ -468,6 +486,7 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb, ...@@ -468,6 +486,7 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb,
out: out:
dput(origin.dentry); dput(origin.dentry);
dput(index); dput(index);
iput(inode);
return dentry; return dentry;
out_err: out_err:
......
...@@ -645,6 +645,22 @@ static bool ovl_verify_inode(struct inode *inode, struct dentry *lowerdentry, ...@@ -645,6 +645,22 @@ static bool ovl_verify_inode(struct inode *inode, struct dentry *lowerdentry,
return true; return true;
} }
struct inode *ovl_lookup_inode(struct super_block *sb, struct dentry *origin)
{
struct inode *inode, *key = d_inode(origin);
inode = ilookup5(sb, (unsigned long) key, ovl_inode_test, key);
if (!inode)
return NULL;
if (!ovl_verify_inode(inode, origin, NULL)) {
iput(inode);
return ERR_PTR(-ESTALE);
}
return inode;
}
struct inode *ovl_get_inode(struct super_block *sb, struct dentry *upperdentry, struct inode *ovl_get_inode(struct super_block *sb, struct dentry *upperdentry,
struct dentry *lowerdentry, struct dentry *index, struct dentry *lowerdentry, struct dentry *index,
unsigned int numlower) unsigned int numlower)
......
...@@ -322,6 +322,7 @@ int ovl_update_time(struct inode *inode, struct timespec *ts, int flags); ...@@ -322,6 +322,7 @@ int ovl_update_time(struct inode *inode, struct timespec *ts, int flags);
bool ovl_is_private_xattr(const char *name); bool ovl_is_private_xattr(const char *name);
struct inode *ovl_new_inode(struct super_block *sb, umode_t mode, dev_t rdev); struct inode *ovl_new_inode(struct super_block *sb, umode_t mode, dev_t rdev);
struct inode *ovl_lookup_inode(struct super_block *sb, struct dentry *origin);
struct inode *ovl_get_inode(struct super_block *sb, struct dentry *upperdentry, struct inode *ovl_get_inode(struct super_block *sb, struct dentry *upperdentry,
struct dentry *lowerdentry, struct dentry *index, struct dentry *lowerdentry, struct dentry *index,
unsigned int numlower); unsigned int numlower);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment