Commit 349b7d77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A small CephFS encryption-related fix and a dead code cleanup"

* tag 'ceph-for-6.15-rc4' of https://github.com/ceph/ceph-client:
  ceph: Fix incorrect flush end position calculation
  ceph: Remove osd_client deadcode
parents 4017040a f452a220

fs/ceph/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ static int fill_fscrypt_truncate(struct inode *inode, 


	/* Try to writeback the dirty pagecaches */

	if (issued & (CEPH_CAP_FILE_BUFFER)) {

		loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;

		loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SIZE - 1;



		ret = filemap_write_and_wait_range(inode->i_mapping,

						   orig_pos, lend);

include/linux/ceph/osd_client.h

+0 −6
Original line number Diff line number Diff line
@@ -490,9 +490,6 @@ extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *, 
					struct page **pages, u64 length,

					u32 alignment, bool pages_from_pool,

					bool own_pages);

extern void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *,

					unsigned int which,

					struct ceph_pagelist *pagelist);

#ifdef CONFIG_BLOCK

void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,

				    unsigned int which,
@@ -509,9 +506,6 @@ void osd_req_op_extent_osd_data_bvec_pos(struct ceph_osd_request *osd_req, 
void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,

				unsigned int which, struct iov_iter *iter);



extern void osd_req_op_cls_request_data_pagelist(struct ceph_osd_request *,

					unsigned int which,

					struct ceph_pagelist *pagelist);

extern void osd_req_op_cls_request_data_pages(struct ceph_osd_request *,

					unsigned int which,

					struct page **pages, u64 length,

net/ceph/osd_client.c

+0 −23
Original line number Diff line number Diff line
@@ -220,16 +220,6 @@ void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *osd_req, 
}

EXPORT_SYMBOL(osd_req_op_extent_osd_data_pages);



void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *osd_req,

			unsigned int which, struct ceph_pagelist *pagelist)

{

	struct ceph_osd_data *osd_data;



	osd_data = osd_req_op_data(osd_req, which, extent, osd_data);

	ceph_osd_data_pagelist_init(osd_data, pagelist);

}

EXPORT_SYMBOL(osd_req_op_extent_osd_data_pagelist);



#ifdef CONFIG_BLOCK

void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,

				    unsigned int which,
@@ -297,19 +287,6 @@ static void osd_req_op_cls_request_info_pagelist( 
	ceph_osd_data_pagelist_init(osd_data, pagelist);

}



void osd_req_op_cls_request_data_pagelist(

			struct ceph_osd_request *osd_req,

			unsigned int which, struct ceph_pagelist *pagelist)

{

	struct ceph_osd_data *osd_data;



	osd_data = osd_req_op_data(osd_req, which, cls, request_data);

	ceph_osd_data_pagelist_init(osd_data, pagelist);

	osd_req->r_ops[which].cls.indata_len += pagelist->length;

	osd_req->r_ops[which].indata_len += pagelist->length;

}

EXPORT_SYMBOL(osd_req_op_cls_request_data_pagelist);



void osd_req_op_cls_request_data_pages(struct ceph_osd_request *osd_req,

			unsigned int which, struct page **pages, u64 length,

			u32 alignment, bool pages_from_pool, bool own_pages)