ovl: pass ovl_fs down to functions accessing private xattrs

This paves the way for optionally using the "user.overlay." xattr
namespace.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 4dd5a1b..955ecd4 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -43,7 +43,8 @@ static bool ovl_must_copy_xattr(const char *name)
               !strncmp(name, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN);
 }
 
-int ovl_copy_xattr(struct dentry *old, struct dentry *new)
+int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
+                  struct dentry *new)
 {
        ssize_t list_size, size, value_size = 0;
        char *buf, *name, *value = NULL;
@@ -81,7 +82,7 @@ int ovl_copy_xattr(struct dentry *old, struct dentry *new)
                }
                list_size -= slen;
 
-               if (ovl_is_private_xattr(name))
+               if (ovl_is_private_xattr(sb, name))
                        continue;
 retry:
                size = vfs_getxattr(old, name, value, value_size);
@@ -355,7 +356,8 @@ int ovl_set_origin(struct dentry *dentry, struct dentry *lower,
 }
 
 /* Store file handle of @upper dir in @index dir entry */
-static int ovl_set_upper_fh(struct dentry *upper, struct dentry *index)
+static int ovl_set_upper_fh(struct ovl_fs *ofs, struct dentry *upper,
+                           struct dentry *index)
 {
        const struct ovl_fh *fh;
        int err;
@@ -364,7 +366,7 @@ static int ovl_set_upper_fh(struct dentry *upper, struct dentry *index)
        if (IS_ERR(fh))
                return PTR_ERR(fh);
 
-       err = ovl_do_setxattr(index, OVL_XATTR_UPPER, fh->buf, fh->fb.len);
+       err = ovl_do_setxattr(ofs, index, OVL_XATTR_UPPER, fh->buf, fh->fb.len);
 
        kfree(fh);
        return err;
@@ -409,7 +411,7 @@ static int ovl_create_index(struct dentry *dentry, struct dentry *origin,
        if (IS_ERR(temp))
                goto free_name;
 
-       err = ovl_set_upper_fh(upper, temp);
+       err = ovl_set_upper_fh(OVL_FS(dentry->d_sb), upper, temp);
        if (err)
                goto out;
 
@@ -507,7 +509,7 @@ static int ovl_copy_up_inode(struct ovl_copy_up_ctx *c, struct dentry *temp)
                        return err;
        }
 
-       err = ovl_copy_xattr(c->lowerpath.dentry, temp);
+       err = ovl_copy_xattr(c->dentry->d_sb, c->lowerpath.dentry, temp);
        if (err)
                return err;
 
@@ -847,7 +849,7 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c)
        }
 
 
-       err = ovl_do_removexattr(upperpath.dentry, OVL_XATTR_METACOPY);
+       err = ovl_do_removexattr(ofs, upperpath.dentry, OVL_XATTR_METACOPY);
        if (err)
                goto out_free;
 

diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c
index 1bba481..28a075b 100644 (file)
--- a/fs/overlayfs/dir.c
+++ b/fs/overlayfs/dir.c
@@ -394,7 +394,7 @@ static struct dentry *ovl_clear_empty(struct dentry *dentry,
        if (IS_ERR(opaquedir))
                goto out_unlock;
 
-       err = ovl_copy_xattr(upper, opaquedir);
+       err = ovl_copy_xattr(dentry->d_sb, upper, opaquedir);
        if (err)
                goto out_cleanup;
 

diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c
index 0e696f7..ed35be3 100644 (file)
--- a/fs/overlayfs/export.c
+++ b/fs/overlayfs/export.c
@@ -752,7 +752,7 @@ static struct dentry *ovl_lower_fh_to_d(struct super_block *sb,
                        goto out_err;
        }
        if (index) {
-               err = ovl_verify_origin(index, origin.dentry, false);
+               err = ovl_verify_origin(ofs, index, origin.dentry, false);
                if (err)
                        goto out_err;
        }

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 3b7ed7c..96666fe 100644 (file)
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -327,7 +327,7 @@ static const char *ovl_get_link(struct dentry *dentry,
        return p;
 }
 
-bool ovl_is_private_xattr(const char *name)
+bool ovl_is_private_xattr(struct super_block *sb, const char *name)
 {
        return strncmp(name, OVL_XATTR_PREFIX,
                       sizeof(OVL_XATTR_PREFIX) - 1) == 0;
@@ -391,14 +391,14 @@ int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
        return res;
 }
 
-static bool ovl_can_list(const char *s)
+static bool ovl_can_list(struct super_block *sb, const char *s)
 {
        /* List all non-trusted xatts */
        if (strncmp(s, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN) != 0)
                return true;
 
        /* Never list trusted.overlay, list other trusted for superuser only */
-       return !ovl_is_private_xattr(s) &&
+       return !ovl_is_private_xattr(sb, s) &&
               ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN);
 }
 
@@ -425,7 +425,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)
                        return -EIO;
 
                len -= slen;
-               if (!ovl_can_list(s)) {
+               if (!ovl_can_list(dentry->d_sb, s)) {
                        res -= slen;
                        memmove(s, s + slen, len);
                } else {
@@ -722,7 +722,7 @@ static int ovl_set_nlink_common(struct dentry *dentry,
        if (WARN_ON(len >= sizeof(buf)))
                return -EIO;
 
-       return ovl_do_setxattr(ovl_dentry_upper(dentry),
+       return ovl_do_setxattr(OVL_FS(inode->i_sb), ovl_dentry_upper(dentry),
                               OVL_XATTR_NLINK, buf, len);
 }
 
@@ -736,7 +736,7 @@ int ovl_set_nlink_lower(struct dentry *dentry)
        return ovl_set_nlink_common(dentry, ovl_dentry_lower(dentry), "L%+i");
 }
 
-unsigned int ovl_get_nlink(struct dentry *lowerdentry,
+unsigned int ovl_get_nlink(struct ovl_fs *ofs, struct dentry *lowerdentry,
                           struct dentry *upperdentry,
                           unsigned int fallback)
 {
@@ -748,7 +748,7 @@ unsigned int ovl_get_nlink(struct dentry *lowerdentry,
        if (!lowerdentry || !upperdentry || d_inode(lowerdentry)->i_nlink == 1)
                return fallback;
 
-       err = ovl_do_getxattr(upperdentry, OVL_XATTR_NLINK,
+       err = ovl_do_getxattr(ofs, upperdentry, OVL_XATTR_NLINK,
                              &buf, sizeof(buf) - 1);
        if (err < 0)
                goto fail;
@@ -947,6 +947,7 @@ static struct inode *ovl_iget5(struct super_block *sb, struct inode *newinode,
 struct inode *ovl_get_inode(struct super_block *sb,
                            struct ovl_inode_params *oip)
 {
+       struct ovl_fs *ofs = OVL_FS(sb);
        struct dentry *upperdentry = oip->upperdentry;
        struct ovl_path *lowerpath = oip->lowerpath;
        struct inode *realinode = upperdentry ? d_inode(upperdentry) : NULL;
@@ -994,7 +995,8 @@ struct inode *ovl_get_inode(struct super_block *sb,
 
                /* Recalculate nlink for non-dir due to indexing */
                if (!is_dir)
-                       nlink = ovl_get_nlink(lowerdentry, upperdentry, nlink);
+                       nlink = ovl_get_nlink(ofs, lowerdentry, upperdentry,
+                                             nlink);
                set_nlink(inode, nlink);
                ino = key->i_ino;
        } else {
@@ -1010,7 +1012,7 @@ struct inode *ovl_get_inode(struct super_block *sb,
        ovl_fill_inode(inode, realinode->i_mode, realinode->i_rdev);
        ovl_inode_init(inode, oip, ino, fsid);
 
-       if (upperdentry && ovl_is_impuredir(upperdentry))
+       if (upperdentry && ovl_is_impuredir(sb, upperdentry))
                ovl_set_flag(OVL_IMPURE, inode);
 
        if (oip->index)
@@ -1024,7 +1026,7 @@ struct inode *ovl_get_inode(struct super_block *sb,
        /* Check for non-merge dir that may have whiteouts */
        if (is_dir) {
                if (((upperdentry && lowerdentry) || oip->numlower > 1) ||
-                   ovl_check_origin_xattr(upperdentry ?: lowerdentry)) {
+                   ovl_check_origin_xattr(ofs, upperdentry ?: lowerdentry)) {
                        ovl_set_flag(OVL_WHITEOUTS, inode);
                }
        }

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 18ccf74..56b8d3a 100644 (file)
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -30,8 +30,9 @@ static int ovl_check_redirect(struct dentry *dentry, struct ovl_lookup_data *d,
 {
        int res;
        char *buf;
+       struct ovl_fs *ofs = OVL_FS(d->sb);
 
-       buf = ovl_get_redirect_xattr(dentry, prelen + strlen(post));
+       buf = ovl_get_redirect_xattr(ofs, dentry, prelen + strlen(post));
        if (IS_ERR_OR_NULL(buf))
                return PTR_ERR(buf);
 
@@ -104,12 +105,13 @@ int ovl_check_fb_len(struct ovl_fb *fb, int fb_len)
        return 0;
 }
 
-static struct ovl_fh *ovl_get_fh(struct dentry *dentry, const char *name)
+static struct ovl_fh *ovl_get_fh(struct ovl_fs *ofs, struct dentry *dentry,
+                                const char *name)
 {
        int res, err;
        struct ovl_fh *fh = NULL;
 
-       res = ovl_do_getxattr(dentry, name, NULL, 0);
+       res = ovl_do_getxattr(ofs, dentry, name, NULL, 0);
        if (res < 0) {
                if (res == -ENODATA || res == -EOPNOTSUPP)
                        return NULL;
@@ -123,7 +125,7 @@ static struct ovl_fh *ovl_get_fh(struct dentry *dentry, const char *name)
        if (!fh)
                return ERR_PTR(-ENOMEM);
 
-       res = ovl_do_getxattr(dentry, name, fh->buf, res);
+       res = ovl_do_getxattr(ofs, dentry, name, fh->buf, res);
        if (res < 0)
                goto fail;
 
@@ -186,9 +188,9 @@ struct dentry *ovl_decode_real_fh(struct ovl_fh *fh, struct vfsmount *mnt,
        return real;
 }
 
-static bool ovl_is_opaquedir(struct dentry *dentry)
+static bool ovl_is_opaquedir(struct super_block *sb, struct dentry *dentry)
 {
-       return ovl_check_dir_xattr(dentry, OVL_XATTR_OPAQUE);
+       return ovl_check_dir_xattr(sb, dentry, OVL_XATTR_OPAQUE);
 }
 
 static struct dentry *ovl_lookup_positive_unlocked(const char *name,
@@ -251,7 +253,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
                        d->stop = true;
                        goto put_and_out;
                }
-               err = ovl_check_metacopy_xattr(this);
+               err = ovl_check_metacopy_xattr(OVL_FS(d->sb), this);
                if (err < 0)
                        goto out_err;
 
@@ -271,7 +273,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
                if (d->last)
                        goto out;
 
-               if (ovl_is_opaquedir(this)) {
+               if (ovl_is_opaquedir(d->sb, this)) {
                        d->stop = true;
                        if (last_element)
                                d->opaque = true;
@@ -391,7 +393,7 @@ invalid:
 static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,
                            struct ovl_path **stackp)
 {
-       struct ovl_fh *fh = ovl_get_fh(upperdentry, OVL_XATTR_ORIGIN);
+       struct ovl_fh *fh = ovl_get_fh(ofs, upperdentry, OVL_XATTR_ORIGIN);
        int err;
 
        if (IS_ERR_OR_NULL(fh))
@@ -413,10 +415,10 @@ static int ovl_check_origin(struct ovl_fs *ofs, struct dentry *upperdentry,
  * Verify that @fh matches the file handle stored in xattr @name.
  * Return 0 on match, -ESTALE on mismatch, < 0 on error.
  */
-static int ovl_verify_fh(struct dentry *dentry, const char *name,
-                        const struct ovl_fh *fh)
+static int ovl_verify_fh(struct ovl_fs *ofs, struct dentry *dentry,
+                        const char *name, const struct ovl_fh *fh)
 {
-       struct ovl_fh *ofh = ovl_get_fh(dentry, name);
+       struct ovl_fh *ofh = ovl_get_fh(ofs, dentry, name);
        int err = 0;
 
        if (!ofh)
@@ -440,8 +442,9 @@ static int ovl_verify_fh(struct dentry *dentry, const char *name,
  *
  * Return 0 on match, -ESTALE on mismatch, -ENODATA on no xattr, < 0 on error.
  */
-int ovl_verify_set_fh(struct dentry *dentry, const char *name,
-                     struct dentry *real, bool is_upper, bool set)
+int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry *dentry,
+                     const char *name, struct dentry *real, bool is_upper,
+                     bool set)
 {
        struct inode *inode;
        struct ovl_fh *fh;
@@ -454,9 +457,9 @@ int ovl_verify_set_fh(struct dentry *dentry, const char *name,
                goto fail;
        }
 
-       err = ovl_verify_fh(dentry, name, fh);
+       err = ovl_verify_fh(ofs, dentry, name, fh);
        if (set && err == -ENODATA)
-               err = ovl_do_setxattr(dentry, name, fh->buf, fh->fb.len);
+               err = ovl_do_setxattr(ofs, dentry, name, fh->buf, fh->fb.len);
        if (err)
                goto fail;
 
@@ -481,7 +484,7 @@ struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index)
        if (!d_is_dir(index))
                return dget(index);
 
-       fh = ovl_get_fh(index, OVL_XATTR_UPPER);
+       fh = ovl_get_fh(ofs, index, OVL_XATTR_UPPER);
        if (IS_ERR_OR_NULL(fh))
                return ERR_CAST(fh);
 
@@ -574,7 +577,7 @@ int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index)
                goto fail;
        }
 
-       err = ovl_verify_fh(upper, OVL_XATTR_ORIGIN, fh);
+       err = ovl_verify_fh(ofs, upper, OVL_XATTR_ORIGIN, fh);
        dput(upper);
        if (err)
                goto fail;
@@ -585,7 +588,7 @@ int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index)
                if (err)
                        goto fail;
 
-               if (ovl_get_nlink(origin.dentry, index, 0) == 0)
+               if (ovl_get_nlink(ofs, origin.dentry, index, 0) == 0)
                        goto orphan;
        }
 
@@ -741,7 +744,7 @@ struct dentry *ovl_lookup_index(struct ovl_fs *ofs, struct dentry *upper,
                }
 
                /* Verify that dir index 'upper' xattr points to upper dir */
-               err = ovl_verify_upper(index, upper, false);
+               err = ovl_verify_upper(ofs, index, upper, false);
                if (err) {
                        if (err == -ESTALE) {
                                pr_warn_ratelimited("suspected multiply redirected dir found (upper=%pd2, origin=%pd2, index=%pd2).\n",
@@ -790,12 +793,12 @@ int ovl_path_next(int idx, struct dentry *dentry, struct path *path)
 }
 
 /* Fix missing 'origin' xattr */
-static int ovl_fix_origin(struct dentry *dentry, struct dentry *lower,
-                         struct dentry *upper)
+static int ovl_fix_origin(struct ovl_fs *ofs, struct dentry *dentry,
+                         struct dentry *lower, struct dentry *upper)
 {
        int err;
 
-       if (ovl_check_origin_xattr(upper))
+       if (ovl_check_origin_xattr(ofs, upper))
                return 0;
 
        err = ovl_want_write(dentry);
@@ -920,7 +923,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
                 * of lower dir and set upper parent "impure".
                 */
                if (upperdentry && !ctr && !ofs->noxattr && d.is_dir) {
-                       err = ovl_fix_origin(dentry, this, upperdentry);
+                       err = ovl_fix_origin(ofs, dentry, this, upperdentry);
                        if (err) {
                                dput(this);
                                goto out_put;
@@ -939,7 +942,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
                if (upperdentry && !ctr &&
                    ((d.is_dir && ovl_verify_lower(dentry->d_sb)) ||
                     (!d.is_dir && ofs->config.index && origin_path))) {
-                       err = ovl_verify_origin(upperdentry, this, false);
+                       err = ovl_verify_origin(ofs, upperdentry, this, false);
                        if (err) {
                                dput(this);
                                if (d.is_dir)
@@ -1060,13 +1063,13 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
                ovl_dentry_set_upper_alias(dentry);
        else if (index) {
                upperdentry = dget(index);
-               upperredirect = ovl_get_redirect_xattr(upperdentry, 0);
+               upperredirect = ovl_get_redirect_xattr(ofs, upperdentry, 0);
                if (IS_ERR(upperredirect)) {
                        err = PTR_ERR(upperredirect);
                        upperredirect = NULL;
                        goto out_free_oe;
                }
-               err = ovl_check_metacopy_xattr(upperdentry);
+               err = ovl_check_metacopy_xattr(ofs, upperdentry);
                if (err < 0)
                        goto out_free_oe;
                uppermetacopy = err;

diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index 5f10823..feef0ea 100644 (file)
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -170,14 +170,16 @@ static inline int ovl_do_symlink(struct inode *dir, struct dentry *dentry,
        return err;
 }
 
-static inline ssize_t ovl_do_getxattr(struct dentry *dentry, const char *name,
-                                     void *value, size_t size)
+static inline ssize_t ovl_do_getxattr(struct ovl_fs *ofs, struct dentry *dentry,
+                                     const char *name, void *value,
+                                     size_t size)
 {
        return vfs_getxattr(dentry, name, value, size);
 }
 
-static inline int ovl_do_setxattr(struct dentry *dentry, const char *name,
-                                 const void *value, size_t size)
+static inline int ovl_do_setxattr(struct ovl_fs *ofs, struct dentry *dentry,
+                                 const char *name, const void *value,
+                                 size_t size)
 {
        int err = vfs_setxattr(dentry, name, value, size, 0);
        pr_debug("setxattr(%pd2, \"%s\", \"%*pE\", %zu, 0) = %i\n",
@@ -185,7 +187,8 @@ static inline int ovl_do_setxattr(struct dentry *dentry, const char *name,
        return err;
 }
 
-static inline int ovl_do_removexattr(struct dentry *dentry, const char *name)
+static inline int ovl_do_removexattr(struct ovl_fs *ofs, struct dentry *dentry,
+                                    const char *name)
 {
        int err = vfs_removexattr(dentry, name);
        pr_debug("removexattr(%pd2, \"%s\") = %i\n", dentry, name, err);
@@ -286,8 +289,9 @@ struct file *ovl_path_open(struct path *path, int flags);
 int ovl_copy_up_start(struct dentry *dentry, int flags);
 void ovl_copy_up_end(struct dentry *dentry);
 bool ovl_already_copied_up(struct dentry *dentry, int flags);
-bool ovl_check_origin_xattr(struct dentry *dentry);
-bool ovl_check_dir_xattr(struct dentry *dentry, const char *name);
+bool ovl_check_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry);
+bool ovl_check_dir_xattr(struct super_block *sb, struct dentry *dentry,
+                        const char *name);
 int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,
                       const char *name, const void *value, size_t size,
                       int xerr);
@@ -302,13 +306,15 @@ bool ovl_need_index(struct dentry *dentry);
 int ovl_nlink_start(struct dentry *dentry);
 void ovl_nlink_end(struct dentry *dentry);
 int ovl_lock_rename_workdir(struct dentry *workdir, struct dentry *upperdir);
-int ovl_check_metacopy_xattr(struct dentry *dentry);
+int ovl_check_metacopy_xattr(struct ovl_fs *ofs, struct dentry *dentry);
 bool ovl_is_metacopy_dentry(struct dentry *dentry);
-char *ovl_get_redirect_xattr(struct dentry *dentry, int padding);
+char *ovl_get_redirect_xattr(struct ovl_fs *ofs, struct dentry *dentry,
+                            int padding);
 
-static inline bool ovl_is_impuredir(struct dentry *dentry)
+static inline bool ovl_is_impuredir(struct super_block *sb,
+                                   struct dentry *dentry)
 {
-       return ovl_check_dir_xattr(dentry, OVL_XATTR_IMPURE);
+       return ovl_check_dir_xattr(sb, dentry, OVL_XATTR_IMPURE);
 }
 
 /*
@@ -369,8 +375,9 @@ struct dentry *ovl_decode_real_fh(struct ovl_fh *fh, struct vfsmount *mnt,
                                  bool connected);
 int ovl_check_origin_fh(struct ovl_fs *ofs, struct ovl_fh *fh, bool connected,
                        struct dentry *upperdentry, struct ovl_path **stackp);
-int ovl_verify_set_fh(struct dentry *dentry, const char *name,
-                     struct dentry *real, bool is_upper, bool set);
+int ovl_verify_set_fh(struct ovl_fs *ofs, struct dentry *dentry,
+                     const char *name, struct dentry *real, bool is_upper,
+                     bool set);
 struct dentry *ovl_index_upper(struct ovl_fs *ofs, struct dentry *index);
 int ovl_verify_index(struct ovl_fs *ofs, struct dentry *index);
 int ovl_get_index_name(struct dentry *origin, struct qstr *name);
@@ -382,16 +389,17 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
                          unsigned int flags);
 bool ovl_lower_positive(struct dentry *dentry);
 
-static inline int ovl_verify_origin(struct dentry *upper,
+static inline int ovl_verify_origin(struct ovl_fs *ofs, struct dentry *upper,
                                    struct dentry *origin, bool set)
 {
-       return ovl_verify_set_fh(upper, OVL_XATTR_ORIGIN, origin, false, set);
+       return ovl_verify_set_fh(ofs, upper, OVL_XATTR_ORIGIN, origin,
+                                false, set);
 }
 
-static inline int ovl_verify_upper(struct dentry *index,
-                                   struct dentry *upper, bool set)
+static inline int ovl_verify_upper(struct ovl_fs *ofs, struct dentry *index,
+                                  struct dentry *upper, bool set)
 {
-       return ovl_verify_set_fh(index, OVL_XATTR_UPPER, upper, true, set);
+       return ovl_verify_set_fh(ofs, index, OVL_XATTR_UPPER, upper, true, set);
 }
 
 /* readdir.c */
@@ -408,7 +416,7 @@ int ovl_indexdir_cleanup(struct ovl_fs *ofs);
 /* inode.c */
 int ovl_set_nlink_upper(struct dentry *dentry);
 int ovl_set_nlink_lower(struct dentry *dentry);
-unsigned int ovl_get_nlink(struct dentry *lowerdentry,
+unsigned int ovl_get_nlink(struct ovl_fs *ofs, struct dentry *lowerdentry,
                           struct dentry *upperdentry,
                           unsigned int fallback);
 int ovl_setattr(struct dentry *dentry, struct iattr *attr);
@@ -422,7 +430,7 @@ int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char *name,
 ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size);
 struct posix_acl *ovl_get_acl(struct inode *inode, int type);
 int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags);
-bool ovl_is_private_xattr(const char *name);
+bool ovl_is_private_xattr(struct super_block *sb, const char *name);
 
 struct ovl_inode_params {
        struct inode *newinode;
@@ -488,7 +496,8 @@ void ovl_aio_request_cache_destroy(void);
 int ovl_copy_up(struct dentry *dentry);
 int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_maybe_copy_up(struct dentry *dentry, int flags);
-int ovl_copy_xattr(struct dentry *old, struct dentry *new);
+int ovl_copy_xattr(struct super_block *sb, struct dentry *old,
+                  struct dentry *new);
 int ovl_set_attr(struct dentry *upper, struct kstat *stat);
 struct ovl_fh *ovl_encode_real_fh(struct dentry *real, bool is_upper);
 int ovl_set_origin(struct dentry *dentry, struct dentry *lower,

diff --git a/fs/overlayfs/readdir.c b/fs/overlayfs/readdir.c
index f8cc155..5960020 100644 (file)
--- a/fs/overlayfs/readdir.c
+++ b/fs/overlayfs/readdir.c
@@ -606,6 +606,7 @@ static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path)
 {
        int res;
        struct dentry *dentry = path->dentry;
+       struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
        struct ovl_dir_cache *cache;
 
        cache = ovl_dir_cache(d_inode(dentry));
@@ -632,7 +633,7 @@ static struct ovl_dir_cache *ovl_cache_get_impure(struct path *path)
                 * Removing the "impure" xattr is best effort.
                 */
                if (!ovl_want_write(dentry)) {
-                       ovl_do_removexattr(ovl_dentry_upper(dentry),
+                       ovl_do_removexattr(ofs, ovl_dentry_upper(dentry),
                                           OVL_XATTR_IMPURE);
                        ovl_drop_write(dentry);
                }

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index fcfb32a..290983b 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1319,7 +1319,7 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
        /*
         * Check if upper/work fs supports trusted.overlay.* xattr
         */
-       err = ovl_do_setxattr(ofs->workdir, OVL_XATTR_OPAQUE, "0", 1);
+       err = ovl_do_setxattr(ofs, ofs->workdir, OVL_XATTR_OPAQUE, "0", 1);
        if (err) {
                ofs->noxattr = true;
                ofs->config.index = false;
@@ -1327,7 +1327,7 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
                pr_warn("upper fs does not support xattr, falling back to index=off and metacopy=off.\n");
                err = 0;
        } else {
-               ovl_do_removexattr(ofs->workdir, OVL_XATTR_OPAQUE);
+               ovl_do_removexattr(ofs, ofs->workdir, OVL_XATTR_OPAQUE);
        }
 
        /*
@@ -1430,8 +1430,8 @@ static int ovl_get_indexdir(struct super_block *sb, struct ovl_fs *ofs,
                return err;
 
        /* Verify lower root is upper root origin */
-       err = ovl_verify_origin(upperpath->dentry, oe->lowerstack[0].dentry,
-                               true);
+       err = ovl_verify_origin(ofs, upperpath->dentry,
+                               oe->lowerstack[0].dentry, true);
        if (err) {
                pr_err("failed to verify upper root origin\n");
                goto out;
@@ -1462,13 +1462,15 @@ static int ovl_get_indexdir(struct super_block *sb, struct ovl_fs *ofs,
                 * "trusted.overlay.upper" to indicate that index may have
                 * directory entries.
                 */
-               if (ovl_check_origin_xattr(ofs->indexdir)) {
-                       err = ovl_verify_set_fh(ofs->indexdir, OVL_XATTR_ORIGIN,
+               if (ovl_check_origin_xattr(ofs, ofs->indexdir)) {
+                       err = ovl_verify_set_fh(ofs, ofs->indexdir,
+                                               OVL_XATTR_ORIGIN,
                                                upperpath->dentry, true, false);
                        if (err)
                                pr_err("failed to verify index dir 'origin' xattr\n");
                }
-               err = ovl_verify_upper(ofs->indexdir, upperpath->dentry, true);
+               err = ovl_verify_upper(ofs, ofs->indexdir, upperpath->dentry,
+                                      true);
                if (err)
                        pr_err("failed to verify index dir 'upper' xattr\n");
 
@@ -1834,7 +1836,7 @@ static struct dentry *ovl_get_root(struct super_block *sb,
                ino = d_inode(upperdentry)->i_ino;
                fsid = 0;
                ovl_dentry_set_upper_alias(root);
-               if (ovl_is_impuredir(upperdentry))
+               if (ovl_is_impuredir(sb, upperdentry))
                        ovl_set_flag(OVL_IMPURE, d_inode(root));
        }
 

diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
index 7d86dba..17bfc19 100644 (file)
--- a/fs/overlayfs/util.c
+++ b/fs/overlayfs/util.c
@@ -544,11 +544,11 @@ void ovl_copy_up_end(struct dentry *dentry)
        ovl_inode_unlock(d_inode(dentry));
 }
 
-bool ovl_check_origin_xattr(struct dentry *dentry)
+bool ovl_check_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry)
 {
        int res;
 
-       res = ovl_do_getxattr(dentry, OVL_XATTR_ORIGIN, NULL, 0);
+       res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_ORIGIN, NULL, 0);
 
        /* Zero size value means "copied up but origin unknown" */
        if (res >= 0)
@@ -557,7 +557,8 @@ bool ovl_check_origin_xattr(struct dentry *dentry)
        return false;
 }
 
-bool ovl_check_dir_xattr(struct dentry *dentry, const char *name)
+bool ovl_check_dir_xattr(struct super_block *sb, struct dentry *dentry,
+                        const char *name)
 {
        int res;
        char val;
@@ -565,7 +566,7 @@ bool ovl_check_dir_xattr(struct dentry *dentry, const char *name)
        if (!d_is_dir(dentry))
                return false;
 
-       res = ovl_do_getxattr(dentry, name, &val, 1);
+       res = ovl_do_getxattr(OVL_FS(sb), dentry, name, &val, 1);
        if (res == 1 && val == 'y')
                return true;
 
@@ -582,7 +583,7 @@ int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,
        if (ofs->noxattr)
                return xerr;
 
-       err = ovl_do_setxattr(upperdentry, name, value, size);
+       err = ovl_do_setxattr(ofs, upperdentry, name, value, size);
 
        if (err == -EOPNOTSUPP) {
                pr_warn("cannot set %s xattr on upper\n", name);
@@ -845,7 +846,7 @@ err:
 }
 
 /* err < 0, 0 if no metacopy xattr, 1 if metacopy xattr found */
-int ovl_check_metacopy_xattr(struct dentry *dentry)
+int ovl_check_metacopy_xattr(struct ovl_fs *ofs, struct dentry *dentry)
 {
        int res;
 
@@ -853,7 +854,7 @@ int ovl_check_metacopy_xattr(struct dentry *dentry)
        if (!S_ISREG(d_inode(dentry)->i_mode))
                return 0;
 
-       res = ovl_do_getxattr(dentry, OVL_XATTR_METACOPY, NULL, 0);
+       res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_METACOPY, NULL, 0);
        if (res < 0) {
                if (res == -ENODATA || res == -EOPNOTSUPP)
                        return 0;
@@ -882,12 +883,13 @@ bool ovl_is_metacopy_dentry(struct dentry *dentry)
        return (oe->numlower > 1);
 }
 
-char *ovl_get_redirect_xattr(struct dentry *dentry, int padding)
+char *ovl_get_redirect_xattr(struct ovl_fs *ofs, struct dentry *dentry,
+                            int padding)
 {
        int res;
        char *s, *next, *buf = NULL;
 
-       res = ovl_do_getxattr(dentry, OVL_XATTR_REDIRECT, NULL, 0);
+       res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_REDIRECT, NULL, 0);
        if (res == -ENODATA || res == -EOPNOTSUPP)
                return NULL;
        if (res < 0)
@@ -899,7 +901,7 @@ char *ovl_get_redirect_xattr(struct dentry *dentry, int padding)
        if (!buf)
                return ERR_PTR(-ENOMEM);
 
-       res = ovl_do_getxattr(dentry, OVL_XATTR_REDIRECT, buf, res);
+       res = ovl_do_getxattr(ofs, dentry, OVL_XATTR_REDIRECT, buf, res);
        if (res < 0)
                goto fail;
        if (res == 0)