Merge tag 'for-linus-v3.9-rc4' of git://oss.sgi.com/xfs/xfs

[karo-tx-linux.git] / drivers / s390 / char / tape_char.c

diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 2d61db3fc62af5c33c3e84b42624c7ce92da231d..6dc60725de92f704a15dd5c877410832221ec5b8 100644 (file)
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -273,13 +273,13 @@ tapechar_open (struct inode *inode, struct file *filp)
        int minor, rc;
 
        DBF_EVENT(6, "TCHAR:open: %i:%i\n",
-               imajor(filp->f_path.dentry->d_inode),
-               iminor(filp->f_path.dentry->d_inode));
+               imajor(file_inode(filp)),
+               iminor(file_inode(filp)));
 
-       if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
+       if (imajor(file_inode(filp)) != tapechar_major)
                return -ENODEV;
 
-       minor = iminor(filp->f_path.dentry->d_inode);
+       minor = iminor(file_inode(filp));
        device = tape_find_device(minor / TAPE_MINORS_PER_DEV);
        if (IS_ERR(device)) {
                DBF_EVENT(3, "TCHAR:open: tape_find_device() failed\n");