From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- drivers/scsi/sd.c | 2 +- drivers/scsi/st.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/scsi/sd.c~struct-path-convert-scsi drivers/scsi/sd.c --- a/drivers/scsi/sd.c~struct-path-convert-scsi +++ a/drivers/scsi/sd.c @@ -863,7 +863,7 @@ static void sd_rescan(struct device *dev */ static long sd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct block_device *bdev = file->f_dentry->d_inode->i_bdev; + struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev; struct gendisk *disk = bdev->bd_disk; struct scsi_device *sdev = scsi_disk(disk)->device; diff -puN drivers/scsi/st.c~struct-path-convert-scsi drivers/scsi/st.c --- a/drivers/scsi/st.c~struct-path-convert-scsi +++ a/drivers/scsi/st.c @@ -922,7 +922,7 @@ static int check_tape(struct scsi_tape * struct st_modedef *STm; struct st_partstat *STps; char *name = tape_name(STp); - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = filp->f_path.dentry->d_inode; int mode = TAPE_MODE(inode); STp->ready = ST_READY; _