diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:36:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:44 -0500 |
commit | a7113a966241b700aecc7b8cb326cecb62e3c4b2 (patch) | |
tree | b28920a82e7cad67ea6e55826e161ba0e4cf9782 /drivers/char/vc_screen.c | |
parent | 6c648be6f4183775679c1f2cc4d094128f104fb2 (diff) |
[PATCH] struct path: convert char-drivers
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/vc_screen.c')
-rw-r--r-- | drivers/char/vc_screen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index f442b574b44a..26776517f04c 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c | |||
@@ -72,7 +72,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig) | |||
72 | int size; | 72 | int size; |
73 | 73 | ||
74 | down(&con_buf_sem); | 74 | down(&con_buf_sem); |
75 | size = vcs_size(file->f_dentry->d_inode); | 75 | size = vcs_size(file->f_path.dentry->d_inode); |
76 | switch (orig) { | 76 | switch (orig) { |
77 | default: | 77 | default: |
78 | up(&con_buf_sem); | 78 | up(&con_buf_sem); |
@@ -98,7 +98,7 @@ static loff_t vcs_lseek(struct file *file, loff_t offset, int orig) | |||
98 | static ssize_t | 98 | static ssize_t |
99 | vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | 99 | vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) |
100 | { | 100 | { |
101 | struct inode *inode = file->f_dentry->d_inode; | 101 | struct inode *inode = file->f_path.dentry->d_inode; |
102 | unsigned int currcons = iminor(inode); | 102 | unsigned int currcons = iminor(inode); |
103 | struct vc_data *vc; | 103 | struct vc_data *vc; |
104 | long pos; | 104 | long pos; |
@@ -271,7 +271,7 @@ unlock_out: | |||
271 | static ssize_t | 271 | static ssize_t |
272 | vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | 272 | vcs_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) |
273 | { | 273 | { |
274 | struct inode *inode = file->f_dentry->d_inode; | 274 | struct inode *inode = file->f_path.dentry->d_inode; |
275 | unsigned int currcons = iminor(inode); | 275 | unsigned int currcons = iminor(inode); |
276 | struct vc_data *vc; | 276 | struct vc_data *vc; |
277 | long pos; | 277 | long pos; |