Commit e7f52429 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi

ovl: check if upperdir fs supports O_TMPFILE

This is needed for choosing between concurrent copyup
using O_TMPFILE and legacy copyup using workdir+rename.
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent bfe219d3
...@@ -127,6 +127,15 @@ static inline int ovl_do_whiteout(struct inode *dir, struct dentry *dentry) ...@@ -127,6 +127,15 @@ static inline int ovl_do_whiteout(struct inode *dir, struct dentry *dentry)
return err; return err;
} }
static inline struct dentry *ovl_do_tmpfile(struct dentry *dentry, umode_t mode)
{
struct dentry *ret = vfs_tmpfile(dentry, mode, 0);
int err = IS_ERR(ret) ? PTR_ERR(ret) : 0;
pr_debug("tmpfile(%pd2, 0%o) = %i\n", dentry, mode, err);
return ret;
}
static inline struct inode *ovl_inode_real(struct inode *inode, bool *is_upper) static inline struct inode *ovl_inode_real(struct inode *inode, bool *is_upper)
{ {
unsigned long x = (unsigned long) READ_ONCE(inode->i_private); unsigned long x = (unsigned long) READ_ONCE(inode->i_private);
......
...@@ -27,6 +27,7 @@ struct ovl_fs { ...@@ -27,6 +27,7 @@ struct ovl_fs {
struct ovl_config config; struct ovl_config config;
/* creds of process who forced instantiation of super block */ /* creds of process who forced instantiation of super block */
const struct cred *creator_cred; const struct cred *creator_cred;
bool tmpfile;
}; };
/* private information held for every overlayfs dentry */ /* private information held for every overlayfs dentry */
......
...@@ -825,6 +825,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ...@@ -825,6 +825,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
* creation of workdir in previous step. * creation of workdir in previous step.
*/ */
if (ufs->workdir) { if (ufs->workdir) {
struct dentry *temp;
err = ovl_check_d_type_supported(&workpath); err = ovl_check_d_type_supported(&workpath);
if (err < 0) if (err < 0)
goto out_put_workdir; goto out_put_workdir;
...@@ -836,6 +838,14 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ...@@ -836,6 +838,14 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
*/ */
if (!err) if (!err)
pr_warn("overlayfs: upper fs needs to support d_type.\n"); pr_warn("overlayfs: upper fs needs to support d_type.\n");
/* Check if upper/work fs supports O_TMPFILE */
temp = ovl_do_tmpfile(ufs->workdir, S_IFREG | 0);
ufs->tmpfile = !IS_ERR(temp);
if (ufs->tmpfile)
dput(temp);
else
pr_warn("overlayfs: upper fs does not support tmpfile.\n");
} }
} }
......
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