Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

3 files changed, 69 insertions, 41 deletions

diff --git a/fs/pstore/inode.c b/fs/pstore/inode.c
index 08342232cb1c..977ed2723845 100644
--- a/fs/pstore/inode.c
+++ b/fs/pstore/inode.c
@@ -27,6 +27,7 @@
 #include <linux/string.h>
 #include <linux/mount.h>
 #include <linux/ramfs.h>
+#include <linux/parser.h>
 #include <linux/sched.h>
 #include <linux/magic.h>
 #include <linux/pstore.h>
@@ -73,11 +74,16 @@ static int pstore_unlink(struct inode *dir, struct dentry *dentry)
         struct pstore_private *p = dentry->d_inode->i_private;
 
         p->erase(p->id);
-        kfree(p);
 
         return simple_unlink(dir, dentry);
 }
 
+static void pstore_evict_inode(struct inode *inode)
+{
+        end_writeback(inode);
+        kfree(inode->i_private);
+}
+
 static const struct inode_operations pstore_dir_inode_operations = {
         .lookup         = simple_lookup,
         .unlink         = pstore_unlink,
@@ -107,9 +113,52 @@ static struct inode *pstore_get_inode(struct super_block *sb,
         return inode;
 }
 
+enum {
+        Opt_kmsg_bytes, Opt_err
+};
+
+static const match_table_t tokens = {
+        {Opt_kmsg_bytes, "kmsg_bytes=%u"},
+        {Opt_err, NULL}
+};
+
+static void parse_options(char *options)
+{
+        char            *p;
+        substring_t     args[MAX_OPT_ARGS];
+        int             option;
+
+        if (!options)
+                return;
+
+        while ((p = strsep(&options, ",")) != NULL) {
+                int token;
+
+                if (!*p)
+                        continue;
+
+                token = match_token(p, tokens, args);
+                switch (token) {
+                case Opt_kmsg_bytes:
+                        if (!match_int(&args[0], &option))
+                                pstore_set_kmsg_bytes(option);
+                        break;
+                }
+        }
+}
+
+static int pstore_remount(struct super_block *sb, int *flags, char *data)
+{
+        parse_options(data);
+
+        return 0;
+}
+
 static const struct super_operations pstore_ops = {
         .statfs         = simple_statfs,
         .drop_inode     = generic_delete_inode,
+        .evict_inode    = pstore_evict_inode,
+        .remount_fs     = pstore_remount,
         .show_options   = generic_show_options,
 };
 
@@ -209,6 +258,8 @@ int pstore_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_op                = &pstore_ops;
         sb->s_time_gran         = 1;
 
+        parse_options(data);
+
         inode = pstore_get_inode(sb, NULL, S_IFDIR | 0755, 0);
         if (!inode) {
                 err = -ENOMEM;
@@ -252,28 +303,7 @@ static struct file_system_type pstore_fs_type = {
 
 static int __init init_pstore_fs(void)
 {
-        int rc = 0;
-        struct kobject *pstorefs_kobj;
-
-        pstorefs_kobj = kobject_create_and_add("pstore", fs_kobj);
-        if (!pstorefs_kobj) {
-                rc = -ENOMEM;
-                goto done;
-        }
-
-        rc = sysfs_create_file(pstorefs_kobj, &pstore_kmsg_bytes_attr.attr);
-        if (rc)
-                goto done1;
-
-        rc = register_filesystem(&pstore_fs_type);
-        if (rc == 0)
-                goto done;
-
-        sysfs_remove_file(pstorefs_kobj, &pstore_kmsg_bytes_attr.attr);
-done1:
-        kobject_put(pstorefs_kobj);
-done:
-        return rc;
+        return register_filesystem(&pstore_fs_type);
 }
 module_init(init_pstore_fs)
 
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h
index 76c26d2fab29..8c9f23eb1645 100644
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
@@ -1,7 +1,6 @@
+extern void     pstore_set_kmsg_bytes(int);
 extern void     pstore_get_records(void);
 extern int      pstore_mkfile(enum pstore_type_id, char *psname, u64 id,
                               char *data, size_t size,
                               struct timespec time, int (*erase)(u64));
 extern int      pstore_is_mounted(void);
-
-extern struct kobj_attribute pstore_kmsg_bytes_attr;
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 705fdf8abf6e..f835a25625ff 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -37,27 +37,21 @@
 static DEFINE_SPINLOCK(pstore_lock);
 static struct pstore_info *psinfo;
 
-/* How much of the console log to snapshot. /sys/fs/pstore/kmsg_bytes */
+/* How much of the console log to snapshot */
 static unsigned long kmsg_bytes = 10240;
 
-static ssize_t b_show(struct kobject *kobj,
-                      struct kobj_attribute *attr, char *buf)
+void pstore_set_kmsg_bytes(int bytes)
 {
-        return snprintf(buf, PAGE_SIZE, "%lu\n", kmsg_bytes);
+        kmsg_bytes = bytes;
 }
 
-static ssize_t b_store(struct kobject *kobj, struct kobj_attribute *attr,
-                       const char *buf, size_t count)
-{
-        return (sscanf(buf, "%lu", &kmsg_bytes) > 0) ? count : 0;
-}
-
-struct kobj_attribute pstore_kmsg_bytes_attr =
-        __ATTR(kmsg_bytes, S_IRUGO | S_IWUSR, b_show, b_store);
-
 /* Tag each group of saved records with a sequence number */
 static int      oopscount;
 
+static char *reason_str[] = {
+        "Oops", "Panic", "Kexec", "Restart", "Halt", "Poweroff", "Emergency"
+};
+
 /*
  * callback from kmsg_dump. (s2,l2) has the most recently
  * written bytes, older bytes are in (s1,l1). Save as much
@@ -71,15 +65,20 @@ static void pstore_dump(struct kmsg_dumper *dumper,
         unsigned long   s1_start, s2_start;
         unsigned long   l1_cpy, l2_cpy;
         unsigned long   size, total = 0;
-        char            *dst;
+        char            *dst, *why;
         u64             id;
         int             hsize, part = 1;
 
+        if (reason < ARRAY_SIZE(reason_str))
+                why = reason_str[reason];
+        else
+                why = "Unknown";
+
         mutex_lock(&psinfo->buf_mutex);
         oopscount++;
         while (total < kmsg_bytes) {
                 dst = psinfo->buf;
-                hsize = sprintf(dst, "Oops#%d Part%d\n", oopscount, part++);
+                hsize = sprintf(dst, "%s#%d Part%d\n", why, oopscount, part++);
                 size = psinfo->bufsize - hsize;
                 dst += hsize;
 
@@ -96,7 +95,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
                 memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
 
                 id = psinfo->write(PSTORE_TYPE_DMESG, hsize + l1_cpy + l2_cpy);
-                if (pstore_is_mounted())
+                if (reason == KMSG_DUMP_OOPS && pstore_is_mounted())
                         pstore_mkfile(PSTORE_TYPE_DMESG, psinfo->name, id,
                                       psinfo->buf, hsize + l1_cpy + l2_cpy,
                                       CURRENT_TIME, psinfo->erase);