---

yaml --- r: 43611 b: refs/heads/master c: 7ac6207 h: refs/heads/master i: 43609: 8f7f8a6 43607: d4f7dc2 v: v3
git-mirror · Dec 8, 2006 · cca36df · cca36df
1 parent 66d628c
commit cca36df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;