Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-30
+1
-1
fs/ceph/inode.c
+1
-1
fs/ceph/inode.c
···
2367
2367
2368
2368
/* Try to writeback the dirty pagecaches */
2369
2369
if (issued & (CEPH_CAP_FILE_BUFFER)) {
2370
-
loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;
2370
+
loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SIZE - 1;
2371
2371
2372
2372
ret = filemap_write_and_wait_range(inode->i_mapping,
2373
2373
orig_pos, lend);
-6
include/linux/ceph/osd_client.h
-6
include/linux/ceph/osd_client.h
···
490
490
struct page **pages, u64 length,
491
491
u32 alignment, bool pages_from_pool,
492
492
bool own_pages);
493
-
extern void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *,
494
-
unsigned int which,
495
-
struct ceph_pagelist *pagelist);
496
493
#ifdef CONFIG_BLOCK
497
494
void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,
498
495
unsigned int which,
···
506
509
void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,
507
510
unsigned int which, struct iov_iter *iter);
508
511
509
-
extern void osd_req_op_cls_request_data_pagelist(struct ceph_osd_request *,
510
-
unsigned int which,
511
-
struct ceph_pagelist *pagelist);
512
512
extern void osd_req_op_cls_request_data_pages(struct ceph_osd_request *,
513
513
unsigned int which,
514
514
struct page **pages, u64 length,
-23
net/ceph/osd_client.c
-23
net/ceph/osd_client.c
···
220
220
}
221
221
EXPORT_SYMBOL(osd_req_op_extent_osd_data_pages);
222
222
223
-
void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *osd_req,
224
-
unsigned int which, struct ceph_pagelist *pagelist)
225
-
{
226
-
struct ceph_osd_data *osd_data;
227
-
228
-
osd_data = osd_req_op_data(osd_req, which, extent, osd_data);
229
-
ceph_osd_data_pagelist_init(osd_data, pagelist);
230
-
}
231
-
EXPORT_SYMBOL(osd_req_op_extent_osd_data_pagelist);
232
-
233
223
#ifdef CONFIG_BLOCK
234
224
void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,
235
225
unsigned int which,
···
286
296
osd_data = osd_req_op_data(osd_req, which, cls, request_info);
287
297
ceph_osd_data_pagelist_init(osd_data, pagelist);
288
298
}
289
-
290
-
void osd_req_op_cls_request_data_pagelist(
291
-
struct ceph_osd_request *osd_req,
292
-
unsigned int which, struct ceph_pagelist *pagelist)
293
-
{
294
-
struct ceph_osd_data *osd_data;
295
-
296
-
osd_data = osd_req_op_data(osd_req, which, cls, request_data);
297
-
ceph_osd_data_pagelist_init(osd_data, pagelist);
298
-
osd_req->r_ops[which].cls.indata_len += pagelist->length;
299
-
osd_req->r_ops[which].indata_len += pagelist->length;
300
-
}
301
-
EXPORT_SYMBOL(osd_req_op_cls_request_data_pagelist);
302
299
303
300
void osd_req_op_cls_request_data_pages(struct ceph_osd_request *osd_req,
304
301
unsigned int which, struct page **pages, u64 length,