ovl: pass realinode to ovl_encode_real_fh() instead of realdentry

We want to be able to encode an fid from an inode with no alias.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Link: https://lore.kernel.org/r/20250105162404.357058-2-amir73il@gmail.com
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index 56eee9f23ea9a1457d307cfbbacf5ceebbe77bc9..0c28e5fa340775d7b4cd5d90920d51b045302454 100644 (file)
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -415,13 +415,13 @@ int ovl_set_attr(struct ovl_fs *ofs, struct dentry *upperdentry,
        return err;
 }
 
-struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,
+struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct inode *realinode,
                                  bool is_upper)
 {
        struct ovl_fh *fh;
        int fh_type, dwords;
        int buflen = MAX_HANDLE_SZ;
-       uuid_t *uuid = &real->d_sb->s_uuid;
+       uuid_t *uuid = &realinode->i_sb->s_uuid;
        int err;
 
        /* Make sure the real fid stays 32bit aligned */
@@ -438,7 +438,8 @@ struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,
         * the price or reconnecting the dentry.
         */
        dwords = buflen >> 2;
-       fh_type = exportfs_encode_fh(real, (void *)fh->fb.fid, &dwords, 0);
+       fh_type = exportfs_encode_inode_fh(realinode, (void *)fh->fb.fid,
+                                          &dwords, NULL, 0);
        buflen = (dwords << 2);
 
        err = -EIO;
@@ -479,7 +480,7 @@ struct ovl_fh *ovl_get_origin_fh(struct ovl_fs *ofs, struct dentry *origin)
        if (!ovl_can_decode_fh(origin->d_sb))
                return NULL;
 
-       return ovl_encode_real_fh(ofs, origin, false);
+       return ovl_encode_real_fh(ofs, d_inode(origin), false);
 }
 
 int ovl_set_origin_fh(struct ovl_fs *ofs, const struct ovl_fh *fh,
@@ -504,7 +505,7 @@ static int ovl_set_upper_fh(struct ovl_fs *ofs, struct dentry *upper,
        const struct ovl_fh *fh;
        int err;
 
-       fh = ovl_encode_real_fh(ofs, upper, true);
+       fh = ovl_encode_real_fh(ofs, d_inode(upper), true);
        if (IS_ERR(fh))
                return PTR_ERR(fh);
 

diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c
index 5868cb2229552f877997b3bf7a187cb8c04d44a6..036c9f39a14d7e135359794eefefc7c0b9371b76 100644 (file)
--- a/fs/overlayfs/export.c
+++ b/fs/overlayfs/export.c
@@ -223,6 +223,7 @@ static int ovl_check_encode_origin(struct dentry *dentry)
 static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,
                             u32 *fid, int buflen)
 {
+       struct inode *inode = d_inode(dentry);
        struct ovl_fh *fh = NULL;
        int err, enc_lower;
        int len;
@@ -236,8 +237,8 @@ static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,
                goto fail;
 
        /* Encode an upper or lower file handle */
-       fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_dentry_lower(dentry) :
-                               ovl_dentry_upper(dentry), !enc_lower);
+       fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_inode_lower(inode) :
+                               ovl_inode_upper(inode), !enc_lower);
        if (IS_ERR(fh))
                return PTR_ERR(fh);
 

diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 7e27b7d4adee8f471d9658579ec0e8c37b4d5f74..cea820cb3b55bf4962139ae8948983e9ee423cc9 100644 (file)
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -542,7 +542,7 @@ int ovl_verify_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry,
        struct ovl_fh *fh;
        int err;
 
-       fh = ovl_encode_real_fh(ofs, real, is_upper);
+       fh = ovl_encode_real_fh(ofs, d_inode(real), is_upper);
        err = PTR_ERR(fh);
        if (IS_ERR(fh)) {
                fh = NULL;
@@ -738,7 +738,7 @@ int ovl_get_index_name(struct ovl_fs *ofs, struct dentry *origin,
        struct ovl_fh *fh;
        int err;
 
-       fh = ovl_encode_real_fh(ofs, origin, false);
+       fh = ovl_encode_real_fh(ofs, d_inode(origin), false);
        if (IS_ERR(fh))
                return PTR_ERR(fh);
 

diff --git a/fs/overlayfs/overlayfs.h b/fs/overlayfs/overlayfs.h
index b361f35762be068fb1efa9f6c18472b7f82cad28..0021e2025020260fcf83e29dc9dfdc5c1f3a0900 100644 (file)
--- a/fs/overlayfs/overlayfs.h
+++ b/fs/overlayfs/overlayfs.h
@@ -865,7 +865,7 @@ int ovl_copy_up_with_data(struct dentry *dentry);
 int ovl_maybe_copy_up(struct dentry *dentry, int flags);
 int ovl_copy_xattr(struct super_block *sb, const struct path *path, struct dentry *new);
 int ovl_set_attr(struct ovl_fs *ofs, struct dentry *upper, struct kstat *stat);
-struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,
+struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct inode *realinode,
                                  bool is_upper);
 struct ovl_fh *ovl_get_origin_fh(struct ovl_fs *ofs, struct dentry *origin);
 int ovl_set_origin_fh(struct ovl_fs *ofs, const struct ovl_fh *fh,