Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[mirror_ubuntu-artful-kernel.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 1578c224285e636ed4e088bb591e958813bd4a74..ad7242043bdb8b74872e536b61d01ca05a1de6b3 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1695,8 +1695,7 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
        loff_t *ppos = &iocb->ki_pos;
        loff_t pos = *ppos;
 
-       /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
-       if (file->f_flags & O_DIRECT) {
+       if (io_is_direct(file)) {
                struct address_space *mapping = file->f_mapping;
                struct inode *inode = mapping->host;
                size_t count = iov_iter_count(iter);
@@ -2584,8 +2583,7 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (err)
                goto out;
 
-       /* coalesce the iovecs and go direct-to-BIO for O_DIRECT */
-       if (unlikely(file->f_flags & O_DIRECT)) {
+       if (io_is_direct(file)) {
                loff_t endbyte;
 
                written = generic_file_direct_write(iocb, from, pos);