linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / debugfs / file.c

diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 1e105f9..d575452 100644 (file)
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -45,47 +45,18 @@ struct file_operations debugfs_file_operations = {
        .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, *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
@@ -186,7 +177,7 @@ static ssize_t read_file_bool(struct file *file, char __user *user_buf,
        char buf[3];
        u32 *val = file->private_data;
        
-       if (val)
+       if (*val)
                buf[0] = 'Y';
        else
                buf[0] = 'N';