ceph: allocate sparse_ext map only for sparse reads

[ Upstream commit 18d44c5d062b97b97bb0162d9742440518958dc1 ]

If mounted with sparseread option, ceph_direct_read_write() ends up
making an unnecessarily allocation for O_DIRECT writes.

Fixes: 03bc06c7b0bd ("ceph: add new mount option to enable sparse reads")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Markuze <amarkuze@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 67468d88f139086e73c96c5e4df7c4abd2d80388..851d70200c6b8f5746fe02fc667a802f70336a71 100644 (file)
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1552,7 +1552,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter,
                }
 
                op = &req->r_ops[0];
-               if (sparse) {
+               if (!write && sparse) {
                        extent_cnt = __ceph_sparse_read_ext_count(inode, size);
                        ret = ceph_alloc_sparse_ext_map(op, extent_cnt);
                        if (ret) {

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 9d078b37fe0b9b085894be86db17053227de9a18..abac770bc0b4c7ab682356926792835706d6a756 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1173,6 +1173,8 @@ EXPORT_SYMBOL(ceph_osdc_new_request);
 
 int __ceph_alloc_sparse_ext_map(struct ceph_osd_req_op *op, int cnt)
 {
+       WARN_ON(op->op != CEPH_OSD_OP_SPARSE_READ);
+
        op->extent.sparse_ext_cnt = cnt;
        op->extent.sparse_ext = kmalloc_array(cnt,
                                              sizeof(*op->extent.sparse_ext),