From: Josef Sipek Date: Fri, 8 Dec 2006 10:37:37 +0000 (-0800) Subject: [PATCH] struct path: convert scsi X-Git-Tag: v2.6.20-rc1~34^2~278 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7ac6207b2a6a5b828bc333f2530a3bd48197af3e;p=~emulex%2Finfiniband.git [PATCH] struct path: convert scsi Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index f6a452846fa..978bfc1e0c6 100644 --- a/drivers/scsi/sd.c +++ b/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 --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 587274dd705..e016e0906e1 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -922,7 +922,7 @@ static int check_tape(struct scsi_tape *STp, struct file *filp) 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;