| Message ID | 20231213234031.1081-7-krisman@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Revert setting casefolding dentry operations through s_d_op | expand |
Hi Gabriel, kernel test robot noticed the following build errors: [auto build test ERROR on jaegeuk-f2fs/dev-test] [also build test ERROR on jaegeuk-f2fs/dev tytso-ext4/dev linus/master v6.7-rc5 next-20231214] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Gabriel-Krisman-Bertazi/dcache-Add-helper-to-disable-d_revalidate-for-a-specific-dentry/20231214-074322 base: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git dev-test patch link: https://lore.kernel.org/r/20231213234031.1081-7-krisman%40suse.de patch subject: [PATCH 6/8] f2fs: Set the case-insensitive dentry operations through ->s_d_op config: x86_64-buildonly-randconfig-002-20231214 (https://download.01.org/0day-ci/archive/20231214/202312142238.71N8cNUB-lkp@intel.com/config) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231214/202312142238.71N8cNUB-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202312142238.71N8cNUB-lkp@intel.com/ All errors (new ones prefixed by >>): fs/f2fs/super.c: In function 'f2fs_fill_super': >> fs/f2fs/super.c:4669:15: error: 'struct super_block' has no member named 's_encoding' 4669 | if (sb->s_encoding) | ^~ vim +4669 fs/f2fs/super.c 4491 4492 sb->s_op = &f2fs_sops; 4493 #ifdef CONFIG_FS_ENCRYPTION 4494 sb->s_cop = &f2fs_cryptops; 4495 #endif 4496 #ifdef CONFIG_FS_VERITY 4497 sb->s_vop = &f2fs_verityops; 4498 #endif 4499 sb->s_xattr = f2fs_xattr_handlers; 4500 sb->s_export_op = &f2fs_export_ops; 4501 sb->s_magic = F2FS_SUPER_MAGIC; 4502 sb->s_time_gran = 1; 4503 sb->s_flags = (sb->s_flags & ~SB_POSIXACL) | 4504 (test_opt(sbi, POSIX_ACL) ? SB_POSIXACL : 0); 4505 memcpy(&sb->s_uuid, raw_super->uuid, sizeof(raw_super->uuid)); 4506 sb->s_iflags |= SB_I_CGROUPWB; 4507 4508 /* init f2fs-specific super block info */ 4509 sbi->valid_super_block = valid_super_block; 4510 4511 /* disallow all the data/node/meta page writes */ 4512 set_sbi_flag(sbi, SBI_POR_DOING); 4513 4514 err = f2fs_init_write_merge_io(sbi); 4515 if (err) 4516 goto free_bio_info; 4517 4518 init_sb_info(sbi); 4519 4520 err = f2fs_init_iostat(sbi); 4521 if (err) 4522 goto free_bio_info; 4523 4524 err = init_percpu_info(sbi); 4525 if (err) 4526 goto free_iostat; 4527 4528 if (F2FS_IO_ALIGNED(sbi)) { 4529 sbi->write_io_dummy = 4530 mempool_create_page_pool(2 * (F2FS_IO_SIZE(sbi) - 1), 0); 4531 if (!sbi->write_io_dummy) { 4532 err = -ENOMEM; 4533 goto free_percpu; 4534 } 4535 } 4536 4537 /* init per sbi slab cache */ 4538 err = f2fs_init_xattr_caches(sbi); 4539 if (err) 4540 goto free_io_dummy; 4541 err = f2fs_init_page_array_cache(sbi); 4542 if (err) 4543 goto free_xattr_cache; 4544 4545 /* get an inode for meta space */ 4546 sbi->meta_inode = f2fs_iget(sb, F2FS_META_INO(sbi)); 4547 if (IS_ERR(sbi->meta_inode)) { 4548 f2fs_err(sbi, "Failed to read F2FS meta data inode"); 4549 err = PTR_ERR(sbi->meta_inode); 4550 goto free_page_array_cache; 4551 } 4552 4553 err = f2fs_get_valid_checkpoint(sbi); 4554 if (err) { 4555 f2fs_err(sbi, "Failed to get valid F2FS checkpoint"); 4556 goto free_meta_inode; 4557 } 4558 4559 if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_QUOTA_NEED_FSCK_FLAG)) 4560 set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR); 4561 if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_DISABLED_QUICK_FLAG)) { 4562 set_sbi_flag(sbi, SBI_CP_DISABLED_QUICK); 4563 sbi->interval_time[DISABLE_TIME] = DEF_DISABLE_QUICK_INTERVAL; 4564 } 4565 4566 if (__is_set_ckpt_flags(F2FS_CKPT(sbi), CP_FSCK_FLAG)) 4567 set_sbi_flag(sbi, SBI_NEED_FSCK); 4568 4569 /* Initialize device list */ 4570 err = f2fs_scan_devices(sbi); 4571 if (err) { 4572 f2fs_err(sbi, "Failed to find devices"); 4573 goto free_devices; 4574 } 4575 4576 err = f2fs_init_post_read_wq(sbi); 4577 if (err) { 4578 f2fs_err(sbi, "Failed to initialize post read workqueue"); 4579 goto free_devices; 4580 } 4581 4582 sbi->total_valid_node_count = 4583 le32_to_cpu(sbi->ckpt->valid_node_count); 4584 percpu_counter_set(&sbi->total_valid_inode_count, 4585 le32_to_cpu(sbi->ckpt->valid_inode_count)); 4586 sbi->user_block_count = le64_to_cpu(sbi->ckpt->user_block_count); 4587 sbi->total_valid_block_count = 4588 le64_to_cpu(sbi->ckpt->valid_block_count); 4589 sbi->last_valid_block_count = sbi->total_valid_block_count; 4590 sbi->reserved_blocks = 0; 4591 sbi->current_reserved_blocks = 0; 4592 limit_reserve_root(sbi); 4593 adjust_unusable_cap_perc(sbi); 4594 4595 f2fs_init_extent_cache_info(sbi); 4596 4597 f2fs_init_ino_entry_info(sbi); 4598 4599 f2fs_init_fsync_node_info(sbi); 4600 4601 /* setup checkpoint request control and start checkpoint issue thread */ 4602 f2fs_init_ckpt_req_control(sbi); 4603 if (!f2fs_readonly(sb) && !test_opt(sbi, DISABLE_CHECKPOINT) && 4604 test_opt(sbi, MERGE_CHECKPOINT)) { 4605 err = f2fs_start_ckpt_thread(sbi); 4606 if (err) { 4607 f2fs_err(sbi, 4608 "Failed to start F2FS issue_checkpoint_thread (%d)", 4609 err); 4610 goto stop_ckpt_thread; 4611 } 4612 } 4613 4614 /* setup f2fs internal modules */ 4615 err = f2fs_build_segment_manager(sbi); 4616 if (err) { 4617 f2fs_err(sbi, "Failed to initialize F2FS segment manager (%d)", 4618 err); 4619 goto free_sm; 4620 } 4621 err = f2fs_build_node_manager(sbi); 4622 if (err) { 4623 f2fs_err(sbi, "Failed to initialize F2FS node manager (%d)", 4624 err); 4625 goto free_nm; 4626 } 4627 4628 err = adjust_reserved_segment(sbi); 4629 if (err) 4630 goto free_nm; 4631 4632 /* For write statistics */ 4633 sbi->sectors_written_start = f2fs_get_sectors_written(sbi); 4634 4635 /* Read accumulated write IO statistics if exists */ 4636 seg_i = CURSEG_I(sbi, CURSEG_HOT_NODE); 4637 if (__exist_node_summaries(sbi)) 4638 sbi->kbytes_written = 4639 le64_to_cpu(seg_i->journal->info.kbytes_written); 4640 4641 f2fs_build_gc_manager(sbi); 4642 4643 err = f2fs_build_stats(sbi); 4644 if (err) 4645 goto free_nm; 4646 4647 /* get an inode for node space */ 4648 sbi->node_inode = f2fs_iget(sb, F2FS_NODE_INO(sbi)); 4649 if (IS_ERR(sbi->node_inode)) { 4650 f2fs_err(sbi, "Failed to read node inode"); 4651 err = PTR_ERR(sbi->node_inode); 4652 goto free_stats; 4653 } 4654 4655 /* read root inode and dentry */ 4656 root = f2fs_iget(sb, F2FS_ROOT_INO(sbi)); 4657 if (IS_ERR(root)) { 4658 f2fs_err(sbi, "Failed to read root inode"); 4659 err = PTR_ERR(root); 4660 goto free_node_inode; 4661 } 4662 if (!S_ISDIR(root->i_mode) || !root->i_blocks || 4663 !root->i_size || !root->i_nlink) { 4664 iput(root); 4665 err = -EINVAL; 4666 goto free_node_inode; 4667 } 4668 > 4669 if (sb->s_encoding) 4670 sb->s_d_op = &generic_ci_dentry_ops; 4671 4672 sb->s_root = d_make_root(root); /* allocate root dentry */ 4673 if (!sb->s_root) { 4674 err = -ENOMEM; 4675 goto free_node_inode; 4676 } 4677 4678 err = f2fs_init_compress_inode(sbi); 4679 if (err) 4680 goto free_root_inode; 4681 4682 err = f2fs_register_sysfs(sbi); 4683 if (err) 4684 goto free_compress_inode; 4685
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index d0053b0284d8..4053846e2cd3 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -532,7 +532,11 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, } err = f2fs_prepare_lookup(dir, dentry, &fname); - generic_set_encrypted_ci_d_ops(dentry); + + /* Case-insensitive volumes set dentry ops through sb->s_d_op. */ + if (!dir->i_sb->s_encoding) + generic_set_encrypted_ci_d_ops(dentry); + if (err == -ENOENT) goto out_splice; if (err) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 033af907c3b1..0a199eb5b01e 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -4663,6 +4663,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) goto free_node_inode; } + if (sb->s_encoding) + sb->s_d_op = &generic_ci_dentry_ops; + sb->s_root = d_make_root(root); /* allocate root dentry */ if (!sb->s_root) { err = -ENOMEM;
All dentries in a case-insensitive filesystem have the same set of dentry operations. Therefore, we should let VFS propagate them from sb->s_d_op d_alloc instead of setting at lookup time. This was already the case before commit bb9cd9106b22 ("fscrypt: Have filesystems handle their d_ops"), but it was changed to set at lookup-time to facilitate the integration with fscrypt. But it's a problem because dentries that don't get created through ->lookup() won't have any visibility of the operations. Let's revert to the previous implementation. Suggested-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de> --- fs/f2fs/namei.c | 6 +++++- fs/f2fs/super.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-)