1 files changed, 20 insertions, 34 deletions

diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index 2766a6d3c2e9..1944621930d9 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -91,16 +91,20 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
 
 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
 {
-        unsigned long *value = file->private_data;
+        unsigned long value;
         int retval;
 
         if (*offset)
                 return -EINVAL;
 
-        retval = oprofilefs_ulong_from_user(value, buf, count);
+        retval = oprofilefs_ulong_from_user(&value, buf, count);
+        if (retval)
+                return retval;
 
+        retval = oprofile_set_ulong(file->private_data, value);
         if (retval)
                 return retval;
+
         return count;
 }
 
@@ -126,50 +130,41 @@ static const struct file_operations ulong_ro_fops = {
 };
 
 
-static struct dentry *__oprofilefs_create_file(struct super_block *sb,
+static int __oprofilefs_create_file(struct super_block *sb,
         struct dentry *root, char const *name, const struct file_operations *fops,
-        int perm)
+        int perm, void *priv)
 {
         struct dentry *dentry;
         struct inode *inode;
 
         dentry = d_alloc_name(root, name);
         if (!dentry)
-                return NULL;
+                return -ENOMEM;
         inode = oprofilefs_get_inode(sb, S_IFREG | perm);
         if (!inode) {
                 dput(dentry);
-                return NULL;
+                return -ENOMEM;
         }
         inode->i_fop = fops;
         d_add(dentry, inode);
-        return dentry;
+        dentry->d_inode->i_private = priv;
+        return 0;
 }
 
 
 int oprofilefs_create_ulong(struct super_block *sb, struct dentry *root,
         char const *name, unsigned long *val)
 {
-        struct dentry *d = __oprofilefs_create_file(sb, root, name,
-                                                     &ulong_fops, 0644);
-        if (!d)
-                return -EFAULT;
-
-        d->d_inode->i_private = val;
-        return 0;
+        return __oprofilefs_create_file(sb, root, name,
+                                        &ulong_fops, 0644, val);
 }
 
 
 int oprofilefs_create_ro_ulong(struct super_block *sb, struct dentry *root,
         char const *name, unsigned long *val)
 {
-        struct dentry *d = __oprofilefs_create_file(sb, root, name,
-                                                     &ulong_ro_fops, 0444);
-        if (!d)
-                return -EFAULT;
-
-        d->d_inode->i_private = val;
-        return 0;
+        return __oprofilefs_create_file(sb, root, name,
+                                        &ulong_ro_fops, 0444, val);
 }
 
 
@@ -189,31 +184,22 @@ static const struct file_operations atomic_ro_fops = {
 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
         char const *name, atomic_t *val)
 {
-        struct dentry *d = __oprofilefs_create_file(sb, root, name,
-                                                     &atomic_ro_fops, 0444);
-        if (!d)
-                return -EFAULT;
-
-        d->d_inode->i_private = val;
-        return 0;
+        return __oprofilefs_create_file(sb, root, name,
+                                        &atomic_ro_fops, 0444, val);
 }
 
 
 int oprofilefs_create_file(struct super_block *sb, struct dentry *root,
         char const *name, const struct file_operations *fops)
 {
-        if (!__oprofilefs_create_file(sb, root, name, fops, 0644))
-                return -EFAULT;
-        return 0;
+        return __oprofilefs_create_file(sb, root, name, fops, 0644, NULL);
 }
 
 
 int oprofilefs_create_file_perm(struct super_block *sb, struct dentry *root,
         char const *name, const struct file_operations *fops, int perm)
 {
-        if (!__oprofilefs_create_file(sb, root, name, fops, perm))
-                return -EFAULT;
-        return 0;
+        return __oprofilefs_create_file(sb, root, name, fops, perm, NULL);
 }