From cca36df2fa87bbec11493f14aba98cb94a97efb2 Mon Sep 17 00:00:00 2001 From: Josef Sipek Date: Fri, 8 Dec 2006 02:37:37 -0800 Subject: [PATCH] --- yaml --- r: 43611 b: refs/heads/master c: 7ac6207b2a6a5b828bc333f2530a3bd48197af3e h: refs/heads/master i: 43609: 8f7f8a6e92c028056bb18a1e05f6d1911e0c6822 43607: d4f7dc2b1f1b7d01e7fed4fae019ae673d964695 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sd.c | 2 +- trunk/drivers/scsi/st.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b19d6db342c5..5ca7686ca649 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fa95f726aba6033d7baffcfda484c31b8cfe153 +refs/heads/master: 7ac6207b2a6a5b828bc333f2530a3bd48197af3e diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c index f6a452846fab..978bfc1e0c6a 100644 --- a/trunk/drivers/scsi/sd.c +++ b/trunk/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/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c index 587274dd7059..e016e0906e1a 100644 --- a/trunk/drivers/scsi/st.c +++ b/trunk/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;