3 files changed, 37 insertions, 0 deletions

diff --git a/fs/ubifs/misc.c b/fs/ubifs/misc.c
index 586fd5b578a7..cd23de0f211d 100644
--- a/fs/ubifs/misc.c
+++ b/fs/ubifs/misc.c
@@ -56,3 +56,14 @@ void ubifs_warn(const struct ubifs_info *c, const char *fmt, ...)
 
         va_end(args);
 }
+
+static char *assert_names[] = {
+        [ASSACT_REPORT] = "report",
+        [ASSACT_RO] = "read-only",
+        [ASSACT_PANIC] = "panic",
+};
+
+const char *ubifs_assert_action_name(struct ubifs_info *c)
+{
+        return assert_names[c->assert_action];
+}
diff --git a/fs/ubifs/misc.h b/fs/ubifs/misc.h
index f5d180c0c52e..21d35d7dd975 100644
--- a/fs/ubifs/misc.h
+++ b/fs/ubifs/misc.h
@@ -287,4 +287,6 @@ static inline int ubifs_next_log_lnum(const struct ubifs_info *c, int lnum)
         return lnum;
 }
 
+const char *ubifs_assert_action_name(struct ubifs_info *c);
+
 #endif /* __UBIFS_MISC_H__ */
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index df73b0e1c2f7..c31e7b4f1e1c 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -445,6 +445,7 @@ static int ubifs_show_options(struct seq_file *s, struct dentry *root)
                            ubifs_compr_name(c, c->mount_opts.compr_type));
         }
 
+        seq_printf(s, ",assert=%s", ubifs_assert_action_name(c));
         seq_printf(s, ",ubi=%d,vol=%d", c->vi.ubi_num, c->vi.vol_id);
 
         return 0;
@@ -922,6 +923,7 @@ static int check_volume_empty(struct ubifs_info *c)
  * Opt_chk_data_crc: check CRCs when reading data nodes
  * Opt_no_chk_data_crc: do not check CRCs when reading data nodes
  * Opt_override_compr: override default compressor
+ * Opt_assert: set ubifs_assert() action
  * Opt_err: just end of array marker
  */
 enum {
@@ -932,6 +934,7 @@ enum {
         Opt_chk_data_crc,
         Opt_no_chk_data_crc,
         Opt_override_compr,
+        Opt_assert,
         Opt_ignore,
         Opt_err,
 };
@@ -946,6 +949,7 @@ static const match_table_t tokens = {
         {Opt_override_compr, "compr=%s"},
         {Opt_ignore, "ubi=%s"},
         {Opt_ignore, "vol=%s"},
+        {Opt_assert, "assert=%s"},
         {Opt_err, NULL},
 };
 
@@ -1046,6 +1050,26 @@ static int ubifs_parse_options(struct ubifs_info *c, char *options,
                         c->default_compr = c->mount_opts.compr_type;
                         break;
                 }
+                case Opt_assert:
+                {
+                        char *act = match_strdup(&args[0]);
+
+                        if (!act)
+                                return -ENOMEM;
+                        if (!strcmp(act, "report"))
+                                c->assert_action = ASSACT_REPORT;
+                        else if (!strcmp(act, "read-only"))
+                                c->assert_action = ASSACT_RO;
+                        else if (!strcmp(act, "panic"))
+                                c->assert_action = ASSACT_PANIC;
+                        else {
+                                ubifs_err(c, "unknown assert action \"%s\"", act);
+                                kfree(act);
+                                return -EINVAL;
+                        }
+                        kfree(act);
+                        break;
+                }
                 case Opt_ignore:
                         break;
                 default: