MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ovl: pass realinode to ovl_encode_real_fh() instead of realdentry

Browse Source 
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>
This commit is contained in:
Amir Goldstein 2025-01-05 17:24:03 +01:00 committed by Christian Brauner
parent 03f275adb8
commit 07aeefae7f
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/overlayfs/copy_up.c
View File

@ -415,13 +415,13 @@ int ovl_set_attr(struct ovl_fs *ofs, struct dentry *upperdentry,
return err; 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) bool is_upper)
{ {
struct ovl_fh *fh; struct ovl_fh *fh;
int fh_type, dwords; int fh_type, dwords;
int buflen = MAX_HANDLE_SZ; int buflen = MAX_HANDLE_SZ;
uuid_t *uuid = &real->d_sb->s_uuid; uuid_t *uuid = &realinode->i_sb->s_uuid;
int err; int err;
/* Make sure the real fid stays 32bit aligned */ /* 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. * the price or reconnecting the dentry.
*/ */
dwords = buflen >> 2; 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); buflen = (dwords << 2);
err = -EIO; 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)) if (!ovl_can_decode_fh(origin->d_sb))
return NULL; 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, 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; const struct ovl_fh *fh;
int err; int err;
fh = ovl_encode_real_fh(ofs, upper, true); fh = ovl_encode_real_fh(ofs, d_inode(upper), true);
if (IS_ERR(fh)) if (IS_ERR(fh))
return PTR_ERR(fh); return PTR_ERR(fh);

5
fs/overlayfs/export.c
View File

@ -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, static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,
u32 *fid, int buflen) u32 *fid, int buflen)
{ {
struct inode *inode = d_inode(dentry);
struct ovl_fh *fh = NULL; struct ovl_fh *fh = NULL;
int err, enc_lower; int err, enc_lower;
int len; int len;
@ -236,8 +237,8 @@ static int ovl_dentry_to_fid(struct ovl_fs *ofs, struct dentry *dentry,
goto fail; goto fail;
/* Encode an upper or lower file handle */ /* Encode an upper or lower file handle */
fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_dentry_lower(dentry) : fh = ovl_encode_real_fh(ofs, enc_lower ? ovl_inode_lower(inode) :
ovl_dentry_upper(dentry), !enc_lower); ovl_inode_upper(inode), !enc_lower);
if (IS_ERR(fh)) if (IS_ERR(fh))
return PTR_ERR(fh); return PTR_ERR(fh);

4
fs/overlayfs/namei.c
View File

@ -542,7 +542,7 @@ int ovl_verify_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry,
struct ovl_fh *fh; struct ovl_fh *fh;
int err; 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); err = PTR_ERR(fh);
if (IS_ERR(fh)) { if (IS_ERR(fh)) {
fh = NULL; fh = NULL;
@ -738,7 +738,7 @@ int ovl_get_index_name(struct ovl_fs *ofs, struct dentry *origin,
struct ovl_fh *fh; struct ovl_fh *fh;
int err; int err;
fh = ovl_encode_real_fh(ofs, origin, false); fh = ovl_encode_real_fh(ofs, d_inode(origin), false);
if (IS_ERR(fh)) if (IS_ERR(fh))
return PTR_ERR(fh); return PTR_ERR(fh);

2
fs/overlayfs/overlayfs.h
View File

@ -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_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_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); 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); bool is_upper);
struct ovl_fh *ovl_get_origin_fh(struct ovl_fs *ofs, struct dentry *origin); 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, int ovl_set_origin_fh(struct ovl_fs *ofs, const struct ovl_fh *fh,