Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354879
b: refs/heads/master
c: b0de59b
h: refs/heads/master
i:
  354877: 44101aa
  354875: 45ee1a1
  354871: 8e267ca
  354863: 842554c
  354847: 7ad5302
  354815: c1e0d89
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent 54d685e commit 7aaff2b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cb8081cb6bfbdb867d17cafaaf3509ee31140f7f
refs/heads/master: b0de59b5733d18b0d1974a060860a8b5c1b36a2e
8 changes: 2 additions & 6 deletions trunk/drivers/tty/tty_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7aaff2b

Please sign in to comment.