Skip to content

Commit 5315839

Browse files
electricfaceopsiff
authored andcommitted
refactor(overlayfs): remove code and configurations related to
deepin_err_notify Clean up all conditional compilation code related to CONFIG_DEEPIN_ERR_NOTIFY Signed-off-by: electricface <[email protected]>
1 parent 1d3b551 commit 5315839

File tree

3 files changed

+0
-31
lines changed

3 files changed

+0
-31
lines changed

fs/overlayfs/ovl_entry.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ struct ovl_config {
1919
bool metacopy;
2020
bool userxattr;
2121
bool ovl_volatile;
22-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
23-
bool deepin_err_notify;
24-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
2522
};
2623

2724
struct ovl_sb {

fs/overlayfs/params.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ enum ovl_opt {
5959
Opt_metacopy,
6060
Opt_verity,
6161
Opt_volatile,
62-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
63-
Opt_deepin_err_notify,
64-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
6562
};
6663

6764
static const struct constant_table ovl_parameter_bool[] = {
@@ -162,9 +159,6 @@ const struct fs_parameter_spec ovl_parameter_spec[] = {
162159
fsparam_enum("metacopy", Opt_metacopy, ovl_parameter_bool),
163160
fsparam_enum("verity", Opt_verity, ovl_parameter_verity),
164161
fsparam_flag("volatile", Opt_volatile),
165-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
166-
fsparam_flag("deepin_err_notify", Opt_deepin_err_notify),
167-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
168162
{}
169163
};
170164

@@ -606,11 +600,6 @@ static int ovl_parse_param(struct fs_context *fc, struct fs_parameter *param)
606600
case Opt_userxattr:
607601
config->userxattr = true;
608602
break;
609-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
610-
case Opt_deepin_err_notify:
611-
config->deepin_err_notify = true;
612-
break;
613-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
614603
default:
615604
pr_err("unrecognized mount option \"%s\" or missing value\n",
616605
param->key);
@@ -1022,9 +1011,5 @@ int ovl_show_options(struct seq_file *m, struct dentry *dentry)
10221011
if (ofs->config.verity_mode != ovl_verity_mode_def())
10231012
seq_printf(m, ",verity=%s",
10241013
ovl_verity_mode(&ofs->config));
1025-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
1026-
if (ofs->config.deepin_err_notify)
1027-
seq_puts(m, ",deepin_err_notify");
1028-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
10291014
return 0;
10301015
}

fs/overlayfs/super.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,6 @@ static int ovl_statfs(struct dentry *dentry, struct kstatfs *buf)
267267
return err;
268268
}
269269

270-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
271-
static bool ovl_deepin_should_notify_error(struct super_block *sb)
272-
{
273-
struct ovl_fs *ofs = OVL_FS(sb);
274-
275-
/* Return true if deepin_err_notify mount option was set */
276-
return ofs->config.deepin_err_notify;
277-
}
278-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
279-
280270
static const struct super_operations ovl_super_operations = {
281271
.alloc_inode = ovl_alloc_inode,
282272
.free_inode = ovl_free_inode,
@@ -286,9 +276,6 @@ static const struct super_operations ovl_super_operations = {
286276
.sync_fs = ovl_sync_fs,
287277
.statfs = ovl_statfs,
288278
.show_options = ovl_show_options,
289-
#ifdef CONFIG_DEEPIN_ERR_NOTIFY
290-
.deepin_should_notify_error = ovl_deepin_should_notify_error,
291-
#endif /* CONFIG_DEEPIN_ERR_NOTIFY */
292279
};
293280

294281
#define OVL_WORKDIR_NAME "work"

0 commit comments

Comments
 (0)