Skip to content

Commit bccece1

Browse files
author
Miklos Szeredi
committed
ovl: allow remote upper
No reason to prevent upper layer being a remote filesystem. Do the revalidation in that case, just as we already do for lower layers. This lets virtiofs be used as upper layer, which appears to be a real use case. Signed-off-by: Miklos Szeredi <[email protected]>
1 parent f428884 commit bccece1

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

fs/overlayfs/namei.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -845,8 +845,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
845845
if (err)
846846
goto out;
847847

848-
if (upperdentry && (upperdentry->d_flags & DCACHE_OP_REAL ||
849-
unlikely(ovl_dentry_remote(upperdentry)))) {
848+
if (upperdentry && upperdentry->d_flags & DCACHE_OP_REAL) {
850849
dput(upperdentry);
851850
err = -EREMOTE;
852851
goto out;

fs/overlayfs/super.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,14 @@ static int ovl_dentry_revalidate_common(struct dentry *dentry,
135135
unsigned int flags, bool weak)
136136
{
137137
struct ovl_entry *oe = dentry->d_fsdata;
138+
struct dentry *upper;
138139
unsigned int i;
139140
int ret = 1;
140141

142+
upper = ovl_dentry_upper(dentry);
143+
if (upper)
144+
ret = ovl_revalidate_real(upper, flags, weak);
145+
141146
for (i = 0; ret > 0 && i < oe->numlower; i++) {
142147
ret = ovl_revalidate_real(oe->lowerstack[i].dentry, flags,
143148
weak);
@@ -747,8 +752,7 @@ static int ovl_mount_dir(const char *name, struct path *path)
747752
ovl_unescape(tmp);
748753
err = ovl_mount_dir_noesc(tmp, path);
749754

750-
if (!err && (ovl_dentry_remote(path->dentry) ||
751-
path->dentry->d_flags & DCACHE_OP_REAL)) {
755+
if (!err && path->dentry->d_flags & DCACHE_OP_REAL) {
752756
pr_err("filesystem on '%s' not supported as upperdir\n",
753757
tmp);
754758
path_put_init(path);

fs/overlayfs/util.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ void ovl_dentry_update_reval(struct dentry *dentry, struct dentry *upperdentry,
102102
struct ovl_entry *oe = OVL_E(dentry);
103103
unsigned int i, flags = 0;
104104

105+
if (upperdentry)
106+
flags |= upperdentry->d_flags;
105107
for (i = 0; i < oe->numlower; i++)
106108
flags |= oe->lowerstack[i].dentry->d_flags;
107109

0 commit comments

Comments
 (0)