History

Merge tag 'ceph-for-6.18-rc1' of https://github.com/ceph/ceph-client

Pull ceph updates from Ilya Dryomov: - some messenger improvements (Eric and Max) - address an issue (also affected userspace) of incorrect permissions being granted to users who have access to multiple different CephFS instances within the same cluster (Kotresh) - a bunch of assorted CephFS fixes (Slava) * tag 'ceph-for-6.18-rc1' of https://github.com/ceph/ceph-client: ceph: add bug tracking system info to MAINTAINERS ceph: fix multifs mds auth caps issue ceph: cleanup in ceph_alloc_readdir_reply_buffer() ceph: fix potential NULL dereference issue in ceph_fill_trace() libceph: add empty check to ceph_con_get_out_msg() libceph: pass the message pointer instead of loading con->out_msg libceph: make ceph_con_get_out_msg() return the message pointer ceph: fix potential race condition on operations with CEPH_I_ODIRECT flag ceph: refactor wake_up_bit() pattern of calling ceph: fix potential race condition in ceph_ioctl_lazyio() ceph: fix overflowed constant issue in ceph_do_objects_copy() ceph: fix wrong sizeof argument issue in register_session() ceph: add checking of wait_for_completion_killable() return value ceph: make ceph_start_io_*() killable libceph: Use HMAC-SHA256 library instead of crypto_shash

Linus Torvalds committed 1 year ago

Commit 8bd92382 parents 91b436f d74d6c017 files · +323 −248Browse files

Showing the changes to include/linux (1 of 17 files). Show all

Unified · Split

include/linux/ceph/messenger.h+6−4
@@ -2,6 +2,7 @@ · 1 unmodified line
2#ifndef __FS_CEPH_MESSENGER_H2#ifndef __FS_CEPH_MESSENGER_H
3#define __FS_CEPH_MESSENGER_H3#define __FS_CEPH_MESSENGER_H
4 4
5#include <crypto/sha2.h>
5#include <linux/bvec.h>6#include <linux/bvec.h>
6#include <linux/crypto.h>7#include <linux/crypto.h>
7#include <linux/kref.h>8#include <linux/kref.h>
@@ -412,7 +413,8 @@ struct ceph_connection_v2_info { · 404 unmodified lines
412 struct ceph_msg_data_cursor in_cursor;413 struct ceph_msg_data_cursor in_cursor;
413 struct ceph_msg_data_cursor out_cursor;414 struct ceph_msg_data_cursor out_cursor;
414 415
415 struct crypto_shash *hmac_tfm; /* post-auth signature */416 struct hmac_sha256_key hmac_key; /* post-auth signature */
417 bool hmac_key_set;
416 struct crypto_aead *gcm_tfm; /* on-wire encryption */418 struct crypto_aead *gcm_tfm; /* on-wire encryption */
417 struct aead_request *gcm_req;419 struct aead_request *gcm_req;
418 struct crypto_wait gcm_wait;420 struct crypto_wait gcm_wait;
@@ -548,12 +550,12 @@ void ceph_addr_set_port(struct ceph_entity_addr *addr, int p); · 129 unmodified lines
548void ceph_con_process_message(struct ceph_connection *con);550void ceph_con_process_message(struct ceph_connection *con);
549int ceph_con_in_msg_alloc(struct ceph_connection *con,551int ceph_con_in_msg_alloc(struct ceph_connection *con,
550 struct ceph_msg_header *hdr, int *skip);552 struct ceph_msg_header *hdr, int *skip);
551void ceph_con_get_out_msg(struct ceph_connection *con);553struct ceph_msg *ceph_con_get_out_msg(struct ceph_connection *con);
552 554
553/* messenger_v1.c */555/* messenger_v1.c */
554int ceph_con_v1_try_read(struct ceph_connection *con);556int ceph_con_v1_try_read(struct ceph_connection *con);
555int ceph_con_v1_try_write(struct ceph_connection *con);557int ceph_con_v1_try_write(struct ceph_connection *con);
556void ceph_con_v1_revoke(struct ceph_connection *con);558void ceph_con_v1_revoke(struct ceph_connection *con, struct ceph_msg *msg);
557void ceph_con_v1_revoke_incoming(struct ceph_connection *con);559void ceph_con_v1_revoke_incoming(struct ceph_connection *con);
558bool ceph_con_v1_opened(struct ceph_connection *con);560bool ceph_con_v1_opened(struct ceph_connection *con);
559void ceph_con_v1_reset_session(struct ceph_connection *con);561void ceph_con_v1_reset_session(struct ceph_connection *con);
@@ -562,7 +564,7 @@ void ceph_con_v1_reset_protocol(struct ceph_connection *con); · 2 unmodified lines
562/* messenger_v2.c */564/* messenger_v2.c */
563int ceph_con_v2_try_read(struct ceph_connection *con);565int ceph_con_v2_try_read(struct ceph_connection *con);
564int ceph_con_v2_try_write(struct ceph_connection *con);566int ceph_con_v2_try_write(struct ceph_connection *con);
565void ceph_con_v2_revoke(struct ceph_connection *con);567void ceph_con_v2_revoke(struct ceph_connection *con, struct ceph_msg *msg);
566void ceph_con_v2_revoke_incoming(struct ceph_connection *con);568void ceph_con_v2_revoke_incoming(struct ceph_connection *con);
567bool ceph_con_v2_opened(struct ceph_connection *con);569bool ceph_con_v2_opened(struct ceph_connection *con);
568void ceph_con_v2_reset_session(struct ceph_connection *con);570void ceph_con_v2_reset_session(struct ceph_connection *con);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t