[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>
This commit is contained in:
parent
7fa95f726a
commit
7ac6207b2a
|
@ -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)
|
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 gendisk *disk = bdev->bd_disk;
|
||||||
struct scsi_device *sdev = scsi_disk(disk)->device;
|
struct scsi_device *sdev = scsi_disk(disk)->device;
|
||||||
|
|
||||||
|
|
|
@ -922,7 +922,7 @@ static int check_tape(struct scsi_tape *STp, struct file *filp)
|
||||||
struct st_modedef *STm;
|
struct st_modedef *STm;
|
||||||
struct st_partstat *STps;
|
struct st_partstat *STps;
|
||||||
char *name = tape_name(STp);
|
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);
|
int mode = TAPE_MODE(inode);
|
||||||
|
|
||||||
STp->ready = ST_READY;
|
STp->ready = ST_READY;
|
||||||
|
|
Loading…
Reference in New Issue