1 files changed, 11 insertions, 64 deletions

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 04b505e5a5e2..2fd3d39995d5 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1051,12 +1051,6 @@ random_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
                                 /* like a named pipe */
         }
 
-        /*
-         * If we gave the user some bytes, update the access time.
-         */
-        if (count)
-                file_accessed(file);
-
         return (count ? count : retval);
 }
 
@@ -1107,7 +1101,6 @@ static ssize_t random_write(struct file *file, const char __user *buffer,
                             size_t count, loff_t *ppos)
 {
         size_t ret;
-        struct inode *inode = file->f_path.dentry->d_inode;
 
         ret = write_pool(&blocking_pool, buffer, count);
         if (ret)
@@ -1116,8 +1109,6 @@ static ssize_t random_write(struct file *file, const char __user *buffer,
         if (ret)
                 return ret;
 
-        inode->i_mtime = current_fs_time(inode->i_sb);
-        mark_inode_dirty(inode);
         return (ssize_t)count;
 }
 
@@ -1200,7 +1191,7 @@ const struct file_operations urandom_fops = {
 void generate_random_uuid(unsigned char uuid_out[16])
 {
         get_random_bytes(uuid_out, 16);
-        /* Set UUID version to 4 --- truely random generation */
+        /* Set UUID version to 4 --- truly random generation */
         uuid_out[6] = (uuid_out[6] & 0x0F) | 0x40;
         /* Set the UUID variant to DCE */
         uuid_out[8] = (uuid_out[8] & 0x3F) | 0x80;
@@ -1245,112 +1236,68 @@ static int proc_do_uuid(ctl_table *table, int write,
         if (uuid[8] == 0)
                 generate_random_uuid(uuid);
 
-        sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
-                "%02x%02x%02x%02x%02x%02x",
-                uuid[0],  uuid[1],  uuid[2],  uuid[3],
-                uuid[4],  uuid[5],  uuid[6],  uuid[7],
-                uuid[8],  uuid[9],  uuid[10], uuid[11],
-                uuid[12], uuid[13], uuid[14], uuid[15]);
+        sprintf(buf, "%pU", uuid);
+
         fake_table.data = buf;
         fake_table.maxlen = sizeof(buf);
 
         return proc_dostring(&fake_table, write, buffer, lenp, ppos);
 }
 
-static int uuid_strategy(ctl_table *table,
-                         void __user *oldval, size_t __user *oldlenp,
-                         void __user *newval, size_t newlen)
-{
-        unsigned char tmp_uuid[16], *uuid;
-        unsigned int len;
-
-        if (!oldval || !oldlenp)
-                return 1;
-
-        uuid = table->data;
-        if (!uuid) {
-                uuid = tmp_uuid;
-                uuid[8] = 0;
-        }
-        if (uuid[8] == 0)
-                generate_random_uuid(uuid);
-
-        if (get_user(len, oldlenp))
-                return -EFAULT;
-        if (len) {
-                if (len > 16)
-                        len = 16;
-                if (copy_to_user(oldval, uuid, len) ||
-                    put_user(len, oldlenp))
-                        return -EFAULT;
-        }
-        return 1;
-}
-
 static int sysctl_poolsize = INPUT_POOL_WORDS * 32;
 ctl_table random_table[] = {
         {
-                .ctl_name       = RANDOM_POOLSIZE,
                 .procname       = "poolsize",
                 .data           = &sysctl_poolsize,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
-                .ctl_name       = RANDOM_ENTROPY_COUNT,
                 .procname       = "entropy_avail",
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
                 .data           = &input_pool.entropy_count,
         },
         {
-                .ctl_name       = RANDOM_READ_THRESH,
                 .procname       = "read_wakeup_threshold",
                 .data           = &random_read_wakeup_thresh,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_read_thresh,
                 .extra2         = &max_read_thresh,
         },
         {
-                .ctl_name       = RANDOM_WRITE_THRESH,
                 .procname       = "write_wakeup_threshold",
                 .data           = &random_write_wakeup_thresh,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_write_thresh,
                 .extra2         = &max_write_thresh,
         },
         {
-                .ctl_name       = RANDOM_BOOT_ID,
                 .procname       = "boot_id",
                 .data           = &sysctl_bootid,
                 .maxlen         = 16,
                 .mode           = 0444,
-                .proc_handler   = &proc_do_uuid,
-                .strategy       = &uuid_strategy,
+                .proc_handler   = proc_do_uuid,
         },
         {
-                .ctl_name       = RANDOM_UUID,
                 .procname       = "uuid",
                 .maxlen         = 16,
                 .mode           = 0444,
-                .proc_handler   = &proc_do_uuid,
-                .strategy       = &uuid_strategy,
+                .proc_handler   = proc_do_uuid,
         },
-        { .ctl_name = 0 }
+        { }
 };
 #endif  /* CONFIG_SYSCTL */
 
 /********************************************************************
  *
- * Random funtions for networking
+ * Random functions for networking
  *
  ********************************************************************/