Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 882137c4 authored by Ross Lagerwall's avatar Ross Lagerwall Committed by Steve French
Browse files

cifs: Allow using O_DIRECT with cache=loose 



Currently O_DIRECT is supported with cache=none and cache=strict, but
not cache=loose. Add support for using O_DIRECT when mounted with
cache=loose.

Signed-off-by: default avatarRoss Lagerwall <ross.lagerwall@citrix.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent adfeb3e0

fs/cifs/cifsfs.c

+15 −0
Original line number Diff line number Diff line
@@ -754,6 +754,9 @@ cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
	ssize_t rc;

	struct inode *inode = file_inode(iocb->ki_filp);



	if (iocb->ki_filp->f_flags & O_DIRECT)

		return cifs_user_readv(iocb, iter);



	rc = cifs_revalidate_mapping(inode);

	if (rc)

		return rc;
@@ -768,6 +771,18 @@ static ssize_t cifs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	ssize_t written;

	int rc;



	if (iocb->ki_filp->f_flags & O_DIRECT) {

		written = cifs_user_writev(iocb, from);

		if (written > 0 && CIFS_CACHE_READ(cinode)) {

			cifs_zap_mapping(inode);

			cifs_dbg(FYI,

				 "Set no oplock for inode=%p after a write operation\n",

				 inode);

			cinode->oplock = 0;

		}

		return written;

	}



	written = cifs_get_writer(cinode);

	if (written)

		return written;