diff --git a/[refs] b/[refs] index 47e9ed301e46..684a79253ea2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb8081cb6bfbdb867d17cafaaf3509ee31140f7f +refs/heads/master: b0de59b5733d18b0d1974a060860a8b5c1b36a2e diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c index 54a254ab85c7..8f44d627ccea 100644 --- a/trunk/drivers/tty/tty_io.c +++ b/trunk/drivers/tty/tty_io.c @@ -977,8 +977,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count, else i = -EIO; tty_ldisc_deref(ld); - if (i > 0) - inode->i_atime = current_fs_time(inode->i_sb); + return i; } @@ -1079,11 +1078,8 @@ static inline ssize_t do_tty_write( break; cond_resched(); } - if (written) { - struct inode *inode = file->f_path.dentry->d_inode; - inode->i_mtime = current_fs_time(inode->i_sb); + if (written) ret = written; - } out: tty_write_unlock(tty); return ret;