aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r--drivers/tty/tty_io.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 6b20fd66d4ad..60e48a11b66c 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -536,7 +536,7 @@ EXPORT_SYMBOL_GPL(tty_wakeup);
536 * __tty_hangup - actual handler for hangup events 536 * __tty_hangup - actual handler for hangup events
537 * @work: tty device 537 * @work: tty device
538 * 538 *
539 * This can be called by the "eventd" kernel thread. That is process 539 * This can be called by a "kworker" kernel thread. That is process
540 * synchronous but doesn't hold any locks, so we need to make sure we 540 * synchronous but doesn't hold any locks, so we need to make sure we
541 * have the appropriate locks for what we're doing. 541 * have the appropriate locks for what we're doing.
542 * 542 *
@@ -977,8 +977,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
977 else 977 else
978 i = -EIO; 978 i = -EIO;
979 tty_ldisc_deref(ld); 979 tty_ldisc_deref(ld);
980 if (i > 0) 980
981 inode->i_atime = current_fs_time(inode->i_sb);
982 return i; 981 return i;
983} 982}
984 983
@@ -1079,11 +1078,8 @@ static inline ssize_t do_tty_write(
1079 break; 1078 break;
1080 cond_resched(); 1079 cond_resched();
1081 } 1080 }
1082 if (written) { 1081 if (written)
1083 struct inode *inode = file->f_path.dentry->d_inode;
1084 inode->i_mtime = current_fs_time(inode->i_sb);
1085 ret = written; 1082 ret = written;
1086 }
1087out: 1083out:
1088 tty_write_unlock(tty); 1084 tty_write_unlock(tty);
1089 return ret; 1085 return ret;