vfs: remove open_flags from d_real()
Opening regular files on overlayfs is now handled via ovl_open(). Remove the now unused "open_flags" argument from d_op->d_real() and the d_real() helper. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
@@ -74,28 +74,10 @@ static void ovl_dentry_release(struct dentry *dentry)
|
||||
}
|
||||
}
|
||||
|
||||
static int ovl_check_append_only(struct inode *inode, int flag)
|
||||
{
|
||||
/*
|
||||
* This test was moot in vfs may_open() because overlay inode does
|
||||
* not have the S_APPEND flag, so re-check on real upper inode
|
||||
*/
|
||||
if (IS_APPEND(inode)) {
|
||||
if ((flag & O_ACCMODE) != O_RDONLY && !(flag & O_APPEND))
|
||||
return -EPERM;
|
||||
if (flag & O_TRUNC)
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dentry *ovl_d_real(struct dentry *dentry,
|
||||
const struct inode *inode,
|
||||
unsigned int open_flags)
|
||||
const struct inode *inode)
|
||||
{
|
||||
struct dentry *real;
|
||||
int err;
|
||||
|
||||
/* It's an overlay file */
|
||||
if (inode && d_inode(dentry) == inode)
|
||||
@@ -107,28 +89,16 @@ static struct dentry *ovl_d_real(struct dentry *dentry,
|
||||
goto bug;
|
||||
}
|
||||
|
||||
if (open_flags) {
|
||||
err = ovl_open_maybe_copy_up(dentry, open_flags);
|
||||
if (err)
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
real = ovl_dentry_upper(dentry);
|
||||
if (real && (!inode || inode == d_inode(real))) {
|
||||
if (!inode) {
|
||||
err = ovl_check_append_only(d_inode(real), open_flags);
|
||||
if (err)
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
if (real && (!inode || inode == d_inode(real)))
|
||||
return real;
|
||||
}
|
||||
|
||||
real = ovl_dentry_lower(dentry);
|
||||
if (!real)
|
||||
goto bug;
|
||||
|
||||
/* Handle recursion */
|
||||
real = d_real(real, inode, open_flags);
|
||||
real = d_real(real, inode);
|
||||
|
||||
if (!inode || inode == d_inode(real))
|
||||
return real;
|
||||
|
Fai riferimento in un nuovo problema
Block a user