Commit 8cff8f53 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: don't use special DIO path for encrypted inodes 



Eventually I want to merge the synchronous and direct read codepaths,
possibly via new netfs infrastructure. For now, the direct path is not
crypto-enabled, so use the sync read/write paths instead.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-and-tested-by: default avatarLuís Henriques <lhenriques@suse.de>
Reviewed-by: default avatarMilind Changire <mchangir@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 5c64737d

fs/ceph/file.c

+4 −2
Original line number Diff line number Diff line
@@ -1738,7 +1738,9 @@ static ssize_t ceph_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		     ceph_cap_string(got));



		if (!ceph_has_inline_data(ci)) {

			if (!retry_op && (iocb->ki_flags & IOCB_DIRECT)) {

			if (!retry_op &&

			    (iocb->ki_flags & IOCB_DIRECT) &&

			    !IS_ENCRYPTED(inode)) {

				ret = ceph_direct_read_write(iocb, to,

							     NULL, NULL);

				if (ret >= 0 && ret < len)
@@ -2024,7 +2026,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 


		/* we might need to revert back to that point */

		data = *from;

		if (iocb->ki_flags & IOCB_DIRECT)

		if ((iocb->ki_flags & IOCB_DIRECT) && !IS_ENCRYPTED(inode))

			written = ceph_direct_read_write(iocb, &data, snapc,

							 &prealloc_cf);

		else