[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250520051600.1903319-6-kent.overstreet@linux.dev>
Date: Tue, 20 May 2025 01:15:57 -0400
From: Kent Overstreet <kent.overstreet@...ux.dev>
To: linux-fsdevel@...r.kernel.org,
linux-bcachefs@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-unionfs@...r.kernel.org
Cc: Kent Overstreet <kent.overstreet@...ux.dev>,
Miklos Szeredi <miklos@...redi.hu>,
Amir Goldstein <amir73il@...il.com>,
Alexander Viro <viro@...iv.linux.org.uk>,
Christian Brauner <brauner@...nel.org>,
Jan Kara <jack@...e.cz>
Subject: [PATCH 5/6] bcachefs: Hook up d_casefold_enable()
Hook up BCH_INODE_has_case_insensitive -> S_NO_CASEFOLD, and call the
new dcache methods for exclusion with overlayfs when the flag is
changing.
Signed-off-by: Kent Overstreet <kent.overstreet@...ux.dev>
---
fs/bcachefs/fs.c | 41 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 39 insertions(+), 2 deletions(-)
diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 0b5d52895e05..a02f787a6d05 100644
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -68,6 +68,11 @@ static inline void bch2_inode_flags_to_vfs(struct bch_fs *c, struct bch_inode_in
inode->v.i_flags |= S_CASEFOLD;
else
inode->v.i_flags &= ~S_CASEFOLD;
+
+ if (inode->ei_inode.bi_flags & BCH_INODE_has_case_insensitive)
+ inode->v.i_flags &= ~S_NO_CASEFOLD;
+ else
+ inode->v.i_flags |= S_NO_CASEFOLD;
}
void bch2_inode_update_after_write(struct btree_trans *trans,
@@ -916,6 +921,8 @@ static int bch2_rename2(struct mnt_idmap *idmap,
struct bch_inode_info *dst_inode = to_bch_ei(dst_dentry->d_inode);
struct bch_inode_unpacked dst_dir_u, src_dir_u;
struct bch_inode_unpacked src_inode_u, dst_inode_u, *whiteout_inode_u;
+ struct d_casefold_enable casefold_enable_src = {};
+ struct d_casefold_enable casefold_enable_dst = {};
struct btree_trans *trans;
enum bch_rename_mode mode = flags & RENAME_EXCHANGE
? BCH_RENAME_EXCHANGE
@@ -940,6 +947,21 @@ static int bch2_rename2(struct mnt_idmap *idmap,
src_inode,
dst_inode);
+ if (src_dir != dst_dir) {
+ if (bch2_inode_casefold(c, &src_inode->ei_inode)) {
+ ret = d_casefold_enable(dst_dentry, &casefold_enable_dst);
+ if (ret)
+ goto err;
+ }
+
+ if (mode == BCH_RENAME_EXCHANGE &&
+ bch2_inode_casefold(c, &dst_inode->ei_inode)) {
+ ret = d_casefold_enable(src_dentry, &casefold_enable_src);
+ if (ret)
+ goto err;
+ }
+ }
+
trans = bch2_trans_get(c);
ret = bch2_subvol_is_ro_trans(trans, src_dir->ei_inum.subvol) ?:
@@ -1044,6 +1066,9 @@ static int bch2_rename2(struct mnt_idmap *idmap,
src_inode,
dst_inode);
+ d_casefold_enable_commit(&casefold_enable_dst, ret);
+ d_casefold_enable_commit(&casefold_enable_src, ret);
+
return bch2_err_class(ret);
}
@@ -1710,6 +1735,7 @@ static int bch2_fileattr_set(struct mnt_idmap *idmap,
struct bch_inode_info *inode = to_bch_ei(d_inode(dentry));
struct bch_fs *c = inode->v.i_sb->s_fs_info;
struct flags_set s = {};
+ struct d_casefold_enable casefold_enable = {};
int ret;
if (fa->fsx_valid) {
@@ -1742,9 +1768,17 @@ static int bch2_fileattr_set(struct mnt_idmap *idmap,
s.casefold = (fa->flags & FS_CASEFOLD_FL) != 0;
fa->flags &= ~FS_CASEFOLD_FL;
+ if (s.casefold) {
+ ret = d_casefold_enable(dentry, &casefold_enable);
+ if (ret)
+ goto err;
+ }
+
s.flags |= map_flags_rev(bch_flags_to_uflags, fa->flags);
- if (fa->flags)
- return -EOPNOTSUPP;
+ if (fa->flags) {
+ ret = -EOPNOTSUPP;
+ goto err;
+ }
}
mutex_lock(&inode->ei_update_lock);
@@ -1755,6 +1789,9 @@ static int bch2_fileattr_set(struct mnt_idmap *idmap,
bch2_write_inode(c, inode, fssetxattr_inode_update_fn, &s,
ATTR_CTIME);
mutex_unlock(&inode->ei_update_lock);
+err:
+ d_casefold_enable_commit(&casefold_enable, ret);
+
return ret;
}
--
2.49.0
Powered by blists - more mailing lists