diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2020-06-04 10:48:19 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2020-06-04 10:48:19 +0200 |
| commit | 08f4c7c86d4cf125389dce9d94423024549f9b02 (patch) | |
| tree | 03b8118f015c26a486e0d724426a75f4d4920f3e /fs/overlayfs/export.c | |
| parent | ovl: initialize error in ovl_copy_xattr (diff) | |
| download | linux-08f4c7c86d4cf125389dce9d94423024549f9b02.tar.xz linux-08f4c7c86d4cf125389dce9d94423024549f9b02.zip | |
ovl: add accessor for ofs->upper_mnt
Next patch will remove ofs->upper_mnt, so add an accessor function for this
field.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/overlayfs/export.c')
| -rw-r--r-- | fs/overlayfs/export.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c index 321e24bf5c60..8f4286450f92 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c @@ -204,7 +204,7 @@ static int ovl_check_encode_origin(struct dentry *dentry) * ovl_connect_layer() will try to make origin's layer "connected" by * copying up a "connectable" ancestor. */ - if (d_is_dir(dentry) && ofs->upper_mnt) + if (d_is_dir(dentry) && ovl_upper_mnt(ofs)) return ovl_connect_layer(dentry); /* Lower file handle for indexed and non-upper dir/non-dir */ @@ -677,10 +677,10 @@ static struct dentry *ovl_upper_fh_to_d(struct super_block *sb, struct dentry *dentry; struct dentry *upper; - if (!ofs->upper_mnt) + if (!ovl_upper_mnt(ofs)) return ERR_PTR(-EACCES); - upper = ovl_decode_real_fh(fh, ofs->upper_mnt, true); + upper = ovl_decode_real_fh(fh, ovl_upper_mnt(ofs), true); if (IS_ERR_OR_NULL(upper)) return upper; |