projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
[cascardo/linux.git]
/
fs
/
block_dev.c
diff --git
a/fs/block_dev.c
b/fs/block_dev.c
index
897ee05
..
c7e4163
100644
(file)
--- a/
fs/block_dev.c
+++ b/
fs/block_dev.c
@@
-152,7
+152,8
@@
blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
struct inode *inode = file->f_mapping->host;
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter, offset,
struct inode *inode = file->f_mapping->host;
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter, offset,
- blkdev_get_block, NULL, NULL, 0);
+ blkdev_get_block, NULL, NULL,
+ DIO_SKIP_DIO_COUNT);
}
int __sync_blockdev(struct block_device *bdev, int wait)
}
int __sync_blockdev(struct block_device *bdev, int wait)
@@
-1716,7
+1717,7
@@
struct block_device *lookup_bdev(const char *pathname)
if (error)
return ERR_PTR(error);
if (error)
return ERR_PTR(error);
- inode =
path.dentry->d_inode
;
+ inode =
d_backing_inode(path.dentry)
;
error = -ENOTBLK;
if (!S_ISBLK(inode->i_mode))
goto fail;
error = -ENOTBLK;
if (!S_ISBLK(inode->i_mode))
goto fail;