[PATCH] struct path: convert scsi 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>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index f6a4528..978bfc1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -863,7 +863,7 @@ */ 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 --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 587274d..e016e09 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c
@@ -922,7 +922,7 @@ 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;