You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user