Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / fs / debugfs / file.c
index 548556f..66a5054 100644 (file)
@@ -39,53 +39,24 @@ static int default_open(struct inode *inode, struct file *file)
        return 0;
 }
 
-struct file_operations debugfs_file_operations = {
+const struct file_operations debugfs_file_operations = {
        .read =         default_read_file,
        .write =        default_write_file,
        .open =         default_open,
 };
 
-#define simple_type(type, format, temptype, strtolfn)                          \
-static ssize_t read_file_##type(struct file *file, char __user *user_buf,      \
-                               size_t count, loff_t *ppos)                     \
-{                                                                              \
-       char buf[32];                                                           \
-       type *val = file->private_data;                                         \
-                                                                               \
-       snprintf(buf, sizeof(buf), format "\n", *val);                          \
-       return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));\
-}                                                                              \
-static ssize_t write_file_##type(struct file *file, const char __user *user_buf,\
-                                size_t count, loff_t *ppos)                    \
-{                                                                              \
-       char *endp;                                                             \
-       char buf[32];                                                           \
-       int buf_size;                                                           \
-       type *val = file->private_data;                                         \
-       temptype tmp;                                                           \
-                                                                               \
-       memset(buf, 0x00, sizeof(buf));                                         \
-       buf_size = min(count, (sizeof(buf)-1));                                 \
-       if (copy_from_user(buf, user_buf, buf_size))                            \
-               return -EFAULT;                                                 \
-                                                                               \
-       tmp = strtolfn(buf, &endp, 0);                                          \
-       if ((endp == buf) || ((type)tmp != tmp))                                \
-               return -EINVAL;                                                 \
-       *val = tmp;                                                             \
-       return count;                                                           \
-}                                                                              \
-static struct file_operations fops_##type = {                                  \
-       .read =         read_file_##type,                                       \
-       .write =        write_file_##type,                                      \
-       .open =         default_open,                                           \
-};
-simple_type(u8, "%c", unsigned long, simple_strtoul);
-simple_type(u16, "%hi", unsigned long, simple_strtoul);
-simple_type(u32, "%i", unsigned long, simple_strtoul);
+static void debugfs_u8_set(void *data, u64 val)
+{
+       *(u8 *)data = val;
+}
+static u64 debugfs_u8_get(void *data)
+{
+       return *(u8 *)data;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_u8, debugfs_u8_get, debugfs_u8_set, "%llu\n");
 
 /**
- * debugfs_create_u8 - create a file in the debugfs filesystem that is used to read and write a unsigned 8 bit value.
+ * debugfs_create_u8 - create a file in the debugfs filesystem that is used to read and write an unsigned 8 bit value.
  *
  * @name: a pointer to a string containing the name of the file to create.
  * @mode: the permission that the file should have
@@ -116,8 +87,18 @@ struct dentry *debugfs_create_u8(const char *name, mode_t mode,
 }
 EXPORT_SYMBOL_GPL(debugfs_create_u8);
 
+static void debugfs_u16_set(void *data, u64 val)
+{
+       *(u16 *)data = val;
+}
+static u64 debugfs_u16_get(void *data)
+{
+       return *(u16 *)data;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_u16, debugfs_u16_get, debugfs_u16_set, "%llu\n");
+
 /**
- * debugfs_create_u16 - create a file in the debugfs filesystem that is used to read and write a unsigned 8 bit value.
+ * debugfs_create_u16 - create a file in the debugfs filesystem that is used to read and write an unsigned 16 bit value.
  *
  * @name: a pointer to a string containing the name of the file to create.
  * @mode: the permission that the file should have
@@ -148,8 +129,18 @@ struct dentry *debugfs_create_u16(const char *name, mode_t mode,
 }
 EXPORT_SYMBOL_GPL(debugfs_create_u16);
 
+static void debugfs_u32_set(void *data, u64 val)
+{
+       *(u32 *)data = val;
+}
+static u64 debugfs_u32_get(void *data)
+{
+       return *(u32 *)data;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_u32, debugfs_u32_get, debugfs_u32_set, "%llu\n");
+
 /**
- * debugfs_create_u32 - create a file in the debugfs filesystem that is used to read and write a unsigned 8 bit value.
+ * debugfs_create_u32 - create a file in the debugfs filesystem that is used to read and write an unsigned 32 bit value.
  *
  * @name: a pointer to a string containing the name of the file to create.
  * @mode: the permission that the file should have
@@ -222,7 +213,7 @@ static ssize_t write_file_bool(struct file *file, const char __user *user_buf,
        return count;
 }
 
-static struct file_operations fops_bool = {
+static const struct file_operations fops_bool = {
        .read =         read_file_bool,
        .write =        write_file_bool,
        .open =         default_open,
@@ -260,3 +251,49 @@ struct dentry *debugfs_create_bool(const char *name, mode_t mode,
 }
 EXPORT_SYMBOL_GPL(debugfs_create_bool);
 
+static ssize_t read_file_blob(struct file *file, char __user *user_buf,
+                             size_t count, loff_t *ppos)
+{
+       struct debugfs_blob_wrapper *blob = file->private_data;
+       return simple_read_from_buffer(user_buf, count, ppos, blob->data,
+                       blob->size);
+}
+
+static struct file_operations fops_blob = {
+       .read =         read_file_blob,
+       .open =         default_open,
+};
+
+/**
+ * debugfs_create_blob - create a file in the debugfs filesystem that is
+ * used to read and write a binary blob.
+ *
+ * @name: a pointer to a string containing the name of the file to create.
+ * @mode: the permission that the file should have
+ * @parent: a pointer to the parent dentry for this file.  This should be a
+ *          directory dentry if set.  If this paramater is NULL, then the
+ *          file will be created in the root of the debugfs filesystem.
+ * @blob: a pointer to a struct debugfs_blob_wrapper which contains a pointer
+ *        to the blob data and the size of the data.
+ *
+ * This function creates a file in debugfs with the given name that exports
+ * @blob->data as a binary blob. If the @mode variable is so set it can be
+ * read from. Writing is not supported.
+ *
+ * This function will return a pointer to a dentry if it succeeds.  This
+ * pointer must be passed to the debugfs_remove() function when the file is
+ * to be removed (no automatic cleanup happens if your module is unloaded,
+ * you are responsible here.)  If an error occurs, NULL will be returned.
+ *
+ * If debugfs is not enabled in the kernel, the value -ENODEV will be
+ * returned.  It is not wise to check for this value, but rather, check for
+ * NULL or !NULL instead as to eliminate the need for #ifdef in the calling
+ * code.
+ */
+struct dentry *debugfs_create_blob(const char *name, mode_t mode,
+                                  struct dentry *parent,
+                                  struct debugfs_blob_wrapper *blob)
+{
+       return debugfs_create_file(name, mode, parent, blob, &fops_blob);
+}
+EXPORT_SYMBOL_GPL(debugfs_create_blob);