Merge branch 'drm-fixes-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[deliverable/linux.git] / fs / ntfs / file.c

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 91117ada8528b0090befaeed2fa1ef7c7d38a787..5622ed5a201e3c23c9fdbf611a6c9dab0a50eb0d 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1952,12 +1952,9 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                written = ntfs_perform_write(file, from, iocb->ki_pos);
        current->backing_dev_info = NULL;
        inode_unlock(vi);
-       if (likely(written > 0)) {
-               err = generic_write_sync(file, iocb->ki_pos, written);
-               if (err < 0)
-                       written = 0;
-       }
        iocb->ki_pos += written;
+       if (likely(written > 0))
+               written = generic_write_sync(iocb, written);
        return written ? written : err;
 }