aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-01-23 17:07:38 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-02-22 23:31:31 -0500
commit496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch)
tree8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /drivers/tty
parent57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff)
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/vt/vc_screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index fa7268a93c06..e4ca345873c3 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -101,7 +101,7 @@ vcs_poll_data_get(struct file *file)
101 poll = kzalloc(sizeof(*poll), GFP_KERNEL); 101 poll = kzalloc(sizeof(*poll), GFP_KERNEL);
102 if (!poll) 102 if (!poll)
103 return NULL; 103 return NULL;
104 poll->cons_num = iminor(file->f_path.dentry->d_inode) & 127; 104 poll->cons_num = iminor(file_inode(file)) & 127;
105 init_waitqueue_head(&poll->waitq); 105 init_waitqueue_head(&poll->waitq);
106 poll->notifier.notifier_call = vcs_notifier; 106 poll->notifier.notifier_call = vcs_notifier;
107 if (register_vt_notifier(&poll->notifier) != 0) { 107 if (register_vt_notifier(&poll->notifier) != 0) {
@@ -182,7 +182,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
182 int size; 182 int size;
183 183
184 console_lock(); 184 console_lock();
185 size = vcs_size(file->f_path.dentry->d_inode); 185 size = vcs_size(file_inode(file));
186 console_unlock(); 186 console_unlock();
187 if (size < 0) 187 if (size < 0)
188 return size; 188 return size;
@@ -208,7 +208,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig)
208static ssize_t 208static ssize_t
209vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) 209vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
210{ 210{
211 struct inode *inode = file->f_path.dentry->d_inode; 211 struct inode *inode = file_inode(file);
212 unsigned int currcons = iminor(inode); 212 unsigned int currcons = iminor(inode);
213 struct vc_data *vc; 213 struct vc_data *vc;
214 struct vcs_poll_data *poll; 214 struct vcs_poll_data *poll;
@@ -386,7 +386,7 @@ unlock_out:
386static ssize_t 386static ssize_t
387vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) 387vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
388{ 388{
389 struct inode *inode = file->f_path.dentry->d_inode; 389 struct inode *inode = file_inode(file);
390 unsigned int currcons = iminor(inode); 390 unsigned int currcons = iminor(inode);
391 struct vc_data *vc; 391 struct vc_data *vc;
392 long pos; 392 long pos;