diff --git a/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch b/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch deleted file mode 100644 index 39a56ae..0000000 --- a/patches.suse/reiserfs-mark-read-write-mode-unsupported.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Jeff Mahoney -Subject: reiserfs: mark read-write mode unsupported -References: FATE#323394 -Patch-mainline: Never, SUSE-specific - -SLE15 will not have reiserfs support but it is required to be able to -identify and/or migrate existing file systems. This patch disabled -read-write mode on supported systems. - -We return -EACCES and mount(8) will retry in read-only mode before -issuing a message about the device being read-only. - -Signed-off-by: Jeff Mahoney ---- - fs/reiserfs/super.c | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - ---- a/fs/reiserfs/super.c -+++ b/fs/reiserfs/super.c -@@ -30,6 +30,26 @@ - #include - #include - #include -+#include -+#include -+ -+DECLARE_SUSE_UNSUPPORTED_FEATURE(reiserfs) -+DEFINE_SUSE_UNSUPPORTED_FEATURE(reiserfs) -+ -+static bool check_rw_mount(struct super_block *sb, unsigned long flags) -+{ -+ if (flags & MS_RDONLY) -+ return true; -+ -+ if (reiserfs_allow_unsupported()) { -+ reiserfs_mark_unsupported(); -+ return true; -+ } -+ -+ pr_warn("reiserfs: read-write mode is unsupported.\n"); -+ pr_warn("reiserfs: load module with allow_unsupported=1 to enable read-write mode.\n"); -+ return false; -+} - - struct file_system_type reiserfs_fs_type; - -@@ -1450,6 +1470,9 @@ static int reiserfs_remount(struct super - int i; - #endif - -+ if (!check_rw_mount(s, *mount_flags)) -+ return -EACCES; -+ - new_opts = kstrdup(arg, GFP_KERNEL); - if (arg && !new_opts) - return -ENOMEM; -@@ -1916,6 +1939,9 @@ static int reiserfs_fill_super(struct su - char *qf_names[REISERFS_MAXQUOTAS] = {}; - unsigned int qfmt = 0; - -+ if (!check_rw_mount(s, s->s_flags)) -+ return -EACCES; -+ - save_mount_options(s, data); - - sbi = kzalloc(sizeof(struct reiserfs_sb_info), GFP_KERNEL); diff --git a/series.conf b/series.conf index 723c996..498c208 100644 --- a/series.conf +++ b/series.conf @@ -54822,7 +54822,6 @@ patches.suse/btrfs-suspend-qgroups-during-relocation-recovery.patch patches.suse/0001-btrfs-qgroup-Make-qgroup-async-transaction-commit-mo.patch patches.suse/btrfs-relocation-Work-around-dead-relocation-stage-l.patch - patches.suse/reiserfs-mark-read-write-mode-unsupported.patch patches.suse/reiserfs-add-check-to-detect-corrupted-directory-entry.patch patches.suse/reiserfs-don-t-panic-on-bad-directory-entries.patch