rk3288: clk: support clk_ddr round rate.

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / file.c

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 4635788e14bf8d51dafc729a27f1d5689453e606..ec9770f425381a25e8758e9b53abc26f2ba5bdfa 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -100,7 +100,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
        struct blk_plug plug;
        int unaligned_aio = 0;
        ssize_t ret;
-       int overwrite = 0;
+       int *overwrite = iocb->private;
        size_t length = iov_length(iov, nr_segs);
 
        if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
@@ -118,8 +118,6 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
        mutex_lock(&inode->i_mutex);
        blk_start_plug(&plug);
 
-       iocb->private = &overwrite;
-
        /* check whether we do a DIO overwrite or not */
        if (ext4_should_dioread_nolock(inode) && !unaligned_aio &&
            !file->f_mapping->nrpages && pos + length <= i_size_read(inode)) {
@@ -143,7 +141,7 @@ ext4_file_dio_write(struct kiocb *iocb, const struct iovec *iov,
                 * So we should check these two conditions.
                 */
                if (err == len && (map.m_flags & EXT4_MAP_MAPPED))
-                       overwrite = 1;
+                       *overwrite = 1;
        }
 
        ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
@@ -170,6 +168,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
 {
        struct inode *inode = file_inode(iocb->ki_filp);
        ssize_t ret;
+       int overwrite = 0;
 
        /*
         * If we have encountered a bitmap-format file, the size limit
@@ -190,6 +189,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
                }
        }
 
+       iocb->private = &overwrite;
        if (unlikely(iocb->ki_filp->f_flags & O_DIRECT))
                ret = ext4_file_dio_write(iocb, iov, nr_segs, pos);
        else