forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
3027795e7b
commit
49522c97ac
@ -430,7 +430,7 @@ dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|||||||
int rval;
|
int rval;
|
||||||
|
|
||||||
lock_kernel();
|
lock_kernel();
|
||||||
rval = dasd_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
|
rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
|
|
||||||
return (rval == -EINVAL) ? -ENOIOCTLCMD : rval;
|
return (rval == -EINVAL) ? -ENOIOCTLCMD : rval;
|
||||||
|
@ -419,9 +419,9 @@ fs3270_open(struct inode *inode, struct file *filp)
|
|||||||
struct idal_buffer *ib;
|
struct idal_buffer *ib;
|
||||||
int minor, rc;
|
int minor, rc;
|
||||||
|
|
||||||
if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR)
|
if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
minor = iminor(filp->f_dentry->d_inode);
|
minor = iminor(filp->f_path.dentry->d_inode);
|
||||||
/* Check for minor 0 multiplexer. */
|
/* Check for minor 0 multiplexer. */
|
||||||
if (minor == 0) {
|
if (minor == 0) {
|
||||||
struct tty_struct *tty;
|
struct tty_struct *tty;
|
||||||
|
@ -298,13 +298,13 @@ tapechar_open (struct inode *inode, struct file *filp)
|
|||||||
int minor, rc;
|
int minor, rc;
|
||||||
|
|
||||||
DBF_EVENT(6, "TCHAR:open: %i:%i\n",
|
DBF_EVENT(6, "TCHAR:open: %i:%i\n",
|
||||||
imajor(filp->f_dentry->d_inode),
|
imajor(filp->f_path.dentry->d_inode),
|
||||||
iminor(filp->f_dentry->d_inode));
|
iminor(filp->f_path.dentry->d_inode));
|
||||||
|
|
||||||
if (imajor(filp->f_dentry->d_inode) != tapechar_major)
|
if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
minor = iminor(filp->f_dentry->d_inode);
|
minor = iminor(filp->f_path.dentry->d_inode);
|
||||||
device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
|
device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
|
||||||
if (IS_ERR(device)) {
|
if (IS_ERR(device)) {
|
||||||
DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");
|
DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user