Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd5f049d authored by Alex Elder's avatar Alex Elder
Browse files

ceph: define ceph_encode_8_safe() 



It's kind of a silly macro, but ceph_encode_8_safe() is the only one
missing from an otherwise pretty complete set.  It's not used, but
neither are a couple of the others in this set.

While in there, insert some whitespace to tidy up the alignment of
the line-terminating backslashes in some of the macro definitions.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarDan Mick <dan.mick@inktank.com>
parent 4caf35f9

include/linux/ceph/decode.h

+17 −12
Original line number Original line Diff line number Diff line
@@ -99,8 +99,8 @@ static inline int ceph_has_room(void **p, void *end, size_t n) 
 *

 *

 * There are two possible failures:

 * There are two possible failures:

 *   - converting the string would require accessing memory at or

 *   - converting the string would require accessing memory at or

 *     beyond the "end" pointer provided (-E

 *     beyond the "end" pointer provided (-ERANGE)

 *   - memory could not be allocated for the result

 *   - memory could not be allocated for the result (-ENOMEM)

 */

 */

static inline char *ceph_extract_encoded_string(void **p, void *end,

static inline char *ceph_extract_encoded_string(void **p, void *end,

						size_t *lenp, gfp_t gfp)

						size_t *lenp, gfp_t gfp)
@@ -238,6 +238,11 @@ static inline void ceph_encode_string(void **p, void *end, 
		ceph_encode_need(p, end, sizeof(u16), bad);	\

		ceph_encode_need(p, end, sizeof(u16), bad);	\

		ceph_encode_16(p, v);				\

		ceph_encode_16(p, v);				\

	} while (0)

	} while (0)

#define ceph_encode_8_safe(p, end, v, bad)			\

	do {							\

		ceph_encode_need(p, end, sizeof(u8), bad);	\

		ceph_encode_8(p, v);				\

	} while (0)





#define ceph_encode_copy_safe(p, end, pv, n, bad)		\

#define ceph_encode_copy_safe(p, end, pv, n, bad)		\

	do {							\

	do {							\