diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/DAC960.c | 2 | ||||
-rw-r--r-- | drivers/block/nbd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 9a13e889837e..8f12dc78a848 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c | |||
@@ -6547,7 +6547,7 @@ static ssize_t dac960_user_command_proc_write(struct file *file, | |||
6547 | const char __user *Buffer, | 6547 | const char __user *Buffer, |
6548 | size_t Count, loff_t *pos) | 6548 | size_t Count, loff_t *pos) |
6549 | { | 6549 | { |
6550 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) PDE(file->f_path.dentry->d_inode)->data; | 6550 | DAC960_Controller_T *Controller = (DAC960_Controller_T *) PDE(file_inode(file))->data; |
6551 | unsigned char CommandBuffer[80]; | 6551 | unsigned char CommandBuffer[80]; |
6552 | int Length; | 6552 | int Length; |
6553 | if (Count > sizeof(CommandBuffer)-1) return -EINVAL; | 6553 | if (Count > sizeof(CommandBuffer)-1) return -EINVAL; |
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 043ddcca4abf..ade146bf65e5 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
@@ -625,7 +625,7 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, | |||
625 | return -EBUSY; | 625 | return -EBUSY; |
626 | file = fget(arg); | 626 | file = fget(arg); |
627 | if (file) { | 627 | if (file) { |
628 | struct inode *inode = file->f_path.dentry->d_inode; | 628 | struct inode *inode = file_inode(file); |
629 | if (S_ISSOCK(inode->i_mode)) { | 629 | if (S_ISSOCK(inode->i_mode)) { |
630 | nbd->file = file; | 630 | nbd->file = file; |
631 | nbd->sock = SOCKET_I(inode); | 631 | nbd->sock = SOCKET_I(inode); |