From 7aaff2b0acff2c7ade6c4523610d3d68b89e87c7 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 15 Feb 2013 15:25:05 +0100 Subject: [PATCH] --- yaml --- r: 354879 b: refs/heads/master c: b0de59b5733d18b0d1974a060860a8b5c1b36a2e h: refs/heads/master i: 354877: 44101aab7575434b25db6216f2632dda71addabd 354875: 45ee1a146ae20a7e6c5b6d9f01a37f657a86c3b0 354871: 8e267caabeb04f29c61f8a89a6d8459c60bff662 354863: 842554ce7887f18a6eb4861391f535daae30ae38 354847: 7ad53024ba55ecb6fdacdee5198cccf2495ea37f 354815: c1e0d891adbcde8aced45f686ea5d6de9f3a57da v: v3 --- [refs] | 2 +- trunk/drivers/tty/tty_io.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) 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;