diff options
| author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 11:37:37 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:28:49 +0100 |
| commit | 7ac6207b2a6a5b828bc333f2530a3bd48197af3e (patch) | |
| tree | 5ca70052708db527a5c72dfb96c7280f0eb53618 | |
| parent | [PATCH] struct path: convert sbus (diff) | |
| download | linux-7ac6207b2a6a5b828bc333f2530a3bd48197af3e.tar.xz linux-7ac6207b2a6a5b828bc333f2530a3bd48197af3e.zip | |
[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>
| -rw-r--r-- | drivers/scsi/sd.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/st.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index f6a452846fab..978bfc1e0c6a 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 587274dd7059..e016e0906e1a 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; |