diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:49 -0500 |
commit | 49522c97ac1c19188ff63598cdd0c980ba7f1239 (patch) | |
tree | 0d36bfd7a0b3af0845873e1061c8cd0f3fc0dbf2 /drivers/s390 | |
parent | 3027795e7b873da643e851d62d17f6bcc43d6e4a (diff) |
[PATCH] struct path: convert s390-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/s390')
-rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 2 | ||||
-rw-r--r-- | drivers/s390/char/fs3270.c | 4 | ||||
-rw-r--r-- | drivers/s390/char/tape_char.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 8fed3603e9ea..758cfb542865 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
@@ -430,7 +430,7 @@ dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
430 | int rval; | 430 | int rval; |
431 | 431 | ||
432 | lock_kernel(); | 432 | lock_kernel(); |
433 | rval = dasd_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); | 433 | rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); |
434 | unlock_kernel(); | 434 | unlock_kernel(); |
435 | 435 | ||
436 | return (rval == -EINVAL) ? -ENOIOCTLCMD : rval; | 436 | return (rval == -EINVAL) ? -ENOIOCTLCMD : rval; |
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index ef205ddd31a4..0893d306ae80 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
@@ -419,9 +419,9 @@ fs3270_open(struct inode *inode, struct file *filp) | |||
419 | struct idal_buffer *ib; | 419 | struct idal_buffer *ib; |
420 | int minor, rc; | 420 | int minor, rc; |
421 | 421 | ||
422 | if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR) | 422 | if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR) |
423 | return -ENODEV; | 423 | return -ENODEV; |
424 | minor = iminor(filp->f_dentry->d_inode); | 424 | minor = iminor(filp->f_path.dentry->d_inode); |
425 | /* Check for minor 0 multiplexer. */ | 425 | /* Check for minor 0 multiplexer. */ |
426 | if (minor == 0) { | 426 | if (minor == 0) { |
427 | struct tty_struct *tty; | 427 | struct tty_struct *tty; |
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c index 97f75237bed6..31198c8f2718 100644 --- a/drivers/s390/char/tape_char.c +++ b/drivers/s390/char/tape_char.c | |||
@@ -298,13 +298,13 @@ tapechar_open (struct inode *inode, struct file *filp) | |||
298 | int minor, rc; | 298 | int minor, rc; |
299 | 299 | ||
300 | DBF_EVENT(6, "TCHAR:open: %i:%i\n", | 300 | DBF_EVENT(6, "TCHAR:open: %i:%i\n", |
301 | imajor(filp->f_dentry->d_inode), | 301 | imajor(filp->f_path.dentry->d_inode), |
302 | iminor(filp->f_dentry->d_inode)); | 302 | iminor(filp->f_path.dentry->d_inode)); |
303 | 303 | ||
304 | if (imajor(filp->f_dentry->d_inode) != tapechar_major) | 304 | if (imajor(filp->f_path.dentry->d_inode) != tapechar_major) |
305 | return -ENODEV; | 305 | return -ENODEV; |
306 | 306 | ||
307 | minor = iminor(filp->f_dentry->d_inode); | 307 | minor = iminor(filp->f_path.dentry->d_inode); |
308 | device = tape_get_device(minor / TAPE_MINORS_PER_DEV); | 308 | device = tape_get_device(minor / TAPE_MINORS_PER_DEV); |
309 | if (IS_ERR(device)) { | 309 | if (IS_ERR(device)) { |
310 | DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n"); | 310 | DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n"); |