diff --git a/fs/cachefiles/ondemand.c b/fs/cachefiles/ondemand.c
index cf44e24849cab84b32b0534359af1e7c9005bee8..7ae08e98e41742c7450ba944221c7590fa31f71e 100644
--- a/fs/cachefiles/ondemand.c
+++ b/fs/cachefiles/ondemand.c
@@ -3,8 +3,12 @@
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
 #include <linux/uio.h>
+#include <linux/module.h>
 #include "internal.h"
 
+static bool cachefiles_buffered_ondemand = true;
+module_param_named(buffered_ondemand, cachefiles_buffered_ondemand, bool, 0644);
+
 static int cachefiles_ondemand_fd_release(struct inode *inode,
 					  struct file *file)
 {
@@ -51,13 +55,23 @@ static ssize_t cachefiles_ondemand_fd_write_iter(struct kiocb *kiocb,
 {
 	struct cachefiles_object *object = kiocb->ki_filp->private_data;
 	size_t len = iter->count;
-	loff_t pos = kiocb->ki_pos;
+	struct kiocb iocb;
 	int ret;
 
 	if (!object->file)
 		return -ENOBUFS;
 
-	ret = vfs_iter_write(object->file, iter, &pos, 0);
+	iocb = (struct kiocb) {
+		.ki_filp   = object->file,
+		.ki_pos    = kiocb->ki_pos,
+		.ki_flags  = IOCB_WRITE,
+		.ki_ioprio = get_current_ioprio(),
+	};
+
+	if (!cachefiles_buffered_ondemand)
+		iocb.ki_flags |= IOCB_DIRECT;
+
+	ret = vfs_iocb_iter_write(object->file, &iocb, iter);
 	if (ret != len)
 		return -EIO;
 	return len;