aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-02 12:48:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-02 12:48:49 -0800
commit489b24f2cbdcc1c93f55a2707733bba702ba8dbf (patch)
tree338a574de2e7913a3057f148b047f5ce37d31ba6 /drivers/char
parent4dab75ec3ebf28583fc902ac946b287b5acdbcad (diff)
parentcd1510cb5f892907fe1a662f90b41fb3a42954e0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: random: Remove unused inode variable crypto: padlock-sha - Add import/export support random: drop weird m_time/a_time manipulation
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 8258982b49e..2849713d223 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;
}