Commit 26ec9287 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Stop using NLA_PUT*(). 



These macros no longer exist in kernel version v3.5-rc1.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 7e0f096b

drivers/block/drbd/drbd_nl.c

+32 −22
Original line number Diff line number Diff line
@@ -2554,13 +2554,17 @@ int nla_put_drbd_cfg_context(struct sk_buff *skb, struct drbd_tconn *tconn, unsi 
	nla = nla_nest_start(skb, DRBD_NLA_CFG_CONTEXT);

	if (!nla)

		goto nla_put_failure;

	if (vnr != VOLUME_UNSPECIFIED)

		NLA_PUT_U32(skb, T_ctx_volume, vnr);

	NLA_PUT_STRING(skb, T_ctx_resource_name, tconn->name);

	if (tconn->my_addr_len)

		NLA_PUT(skb, T_ctx_my_addr, tconn->my_addr_len, &tconn->my_addr);

	if (tconn->peer_addr_len)

		NLA_PUT(skb, T_ctx_peer_addr, tconn->peer_addr_len, &tconn->peer_addr);

	if (vnr != VOLUME_UNSPECIFIED &&

	    nla_put_u32(skb, T_ctx_volume, vnr))

		goto nla_put_failure;

	if (nla_put_string(skb, T_ctx_resource_name, tconn->name))

		goto nla_put_failure;

	if (tconn->my_addr_len &&

	    nla_put(skb, T_ctx_my_addr, tconn->my_addr_len, &tconn->my_addr))

		goto nla_put_failure;

	if (tconn->peer_addr_len &&

	    nla_put(skb, T_ctx_peer_addr, tconn->peer_addr_len, &tconn->peer_addr))

		goto nla_put_failure;

	nla_nest_end(skb, nla);

	return 0;
@@ -2618,20 +2622,23 @@ int nla_put_status_info(struct sk_buff *skb, struct drbd_conf *mdev, 
	nla = nla_nest_start(skb, DRBD_NLA_STATE_INFO);

	if (!nla)

		goto nla_put_failure;

	NLA_PUT_U32(skb, T_sib_reason, sib ? sib->sib_reason : SIB_GET_STATUS_REPLY);

	NLA_PUT_U32(skb, T_current_state, mdev->state.i);

	NLA_PUT_U64(skb, T_ed_uuid, mdev->ed_uuid);

	NLA_PUT_U64(skb, T_capacity, drbd_get_capacity(mdev->this_bdev));

	if (nla_put_u32(skb, T_sib_reason, sib ? sib->sib_reason : SIB_GET_STATUS_REPLY) ||

	    nla_put_u32(skb, T_current_state, mdev->state.i) ||

	    nla_put_u64(skb, T_ed_uuid, mdev->ed_uuid) ||

	    nla_put_u64(skb, T_capacity, drbd_get_capacity(mdev->this_bdev)))

		goto nla_put_failure;



	if (got_ldev) {

		NLA_PUT_U32(skb, T_disk_flags, mdev->ldev->md.flags);

		NLA_PUT(skb, T_uuids, sizeof(si->uuids), mdev->ldev->md.uuid);

		NLA_PUT_U64(skb, T_bits_total, drbd_bm_bits(mdev));

		NLA_PUT_U64(skb, T_bits_oos, drbd_bm_total_weight(mdev));

		if (nla_put_u32(skb, T_disk_flags, mdev->ldev->md.flags) ||

		    nla_put(skb, T_uuids, sizeof(si->uuids), mdev->ldev->md.uuid) ||

		    nla_put_u64(skb, T_bits_total, drbd_bm_bits(mdev)) ||

		    nla_put_u64(skb, T_bits_oos, drbd_bm_total_weight(mdev)))

			goto nla_put_failure;

		if (C_SYNC_SOURCE <= mdev->state.conn &&

		    C_PAUSED_SYNC_T >= mdev->state.conn) {

			NLA_PUT_U64(skb, T_bits_rs_total, mdev->rs_total);

			NLA_PUT_U64(skb, T_bits_rs_failed, mdev->rs_failed);

			if (nla_put_u64(skb, T_bits_rs_total, mdev->rs_total) ||

			    nla_put_u64(skb, T_bits_rs_failed, mdev->rs_failed))

				goto nla_put_failure;

		}

	}
@@ -2641,15 +2648,18 @@ int nla_put_status_info(struct sk_buff *skb, struct drbd_conf *mdev, 
		case SIB_GET_STATUS_REPLY:

			break;

		case SIB_STATE_CHANGE:

			NLA_PUT_U32(skb, T_prev_state, sib->os.i);

			NLA_PUT_U32(skb, T_new_state, sib->ns.i);

			if (nla_put_u32(skb, T_prev_state, sib->os.i) ||

			    nla_put_u32(skb, T_new_state, sib->ns.i))

				goto nla_put_failure;

			break;

		case SIB_HELPER_POST:

			NLA_PUT_U32(skb,

				T_helper_exit_code, sib->helper_exit_code);

			if (nla_put_u32(skb, T_helper_exit_code,

					sib->helper_exit_code))

				goto nla_put_failure;

			/* fall through */

		case SIB_HELPER_PRE:

			NLA_PUT_STRING(skb, T_helper, sib->helper_name);

			if (nla_put_string(skb, T_helper, sib->helper_name))

				goto nla_put_failure;

			break;

		}

	}

include/linux/genl_magic_func.h

+5 −3
Original line number Diff line number Diff line
@@ -367,7 +367,8 @@ static inline int s_name ## _to_unpriv_skb(struct sk_buff *skb, \ 
		__is_signed)						\

	if (!exclude_sensitive || !((attr_flag) & DRBD_F_SENSITIVE)) {	\

		DPRINT_FIELD(">>", nla_type, name, s, NULL);		\

		__put(skb, attr_nr, s->name);				\

		if (__put(skb, attr_nr, s->name))			\

			goto nla_put_failure;				\

	}



#undef __array
@@ -375,9 +376,10 @@ static inline int s_name ## _to_unpriv_skb(struct sk_buff *skb, \ 
		__get, __put, __is_signed)				\

	if (!exclude_sensitive || !((attr_flag) & DRBD_F_SENSITIVE)) {	\

		DPRINT_ARRAY(">>",nla_type, name, s, NULL);		\

		__put(skb, attr_nr, min_t(int, maxlen,			\

		if (__put(skb, attr_nr, min_t(int, maxlen,		\

			s->name ## _len + (nla_type == NLA_NUL_STRING)),\

						s->name);		\

						s->name))		\

			goto nla_put_failure;				\

	}



#include GENL_MAGIC_INCLUDE_FILE

include/linux/genl_magic_struct.h

+8 −8
Original line number Diff line number Diff line
@@ -65,28 +65,28 @@ extern void CONCAT_(GENL_MAGIC_FAMILY, _genl_unregister)(void); 
/* possible field types */

#define __flg_field(attr_nr, attr_flag, name) \

	__field(attr_nr, attr_flag, name, NLA_U8, char, \

			nla_get_u8, NLA_PUT_U8, false)

			nla_get_u8, nla_put_u8, false)

#define __u8_field(attr_nr, attr_flag, name)	\

	__field(attr_nr, attr_flag, name, NLA_U8, unsigned char, \

			nla_get_u8, NLA_PUT_U8, false)

			nla_get_u8, nla_put_u8, false)

#define __u16_field(attr_nr, attr_flag, name)	\

	__field(attr_nr, attr_flag, name, NLA_U16, __u16, \

			nla_get_u16, NLA_PUT_U16, false)

			nla_get_u16, nla_put_u16, false)

#define __u32_field(attr_nr, attr_flag, name)	\

	__field(attr_nr, attr_flag, name, NLA_U32, __u32, \

			nla_get_u32, NLA_PUT_U32, false)

			nla_get_u32, nla_put_u32, false)

#define __s32_field(attr_nr, attr_flag, name)	\

	__field(attr_nr, attr_flag, name, NLA_U32, __s32, \

			nla_get_u32, NLA_PUT_U32, true)

			nla_get_u32, nla_put_u32, true)

#define __u64_field(attr_nr, attr_flag, name)	\

	__field(attr_nr, attr_flag, name, NLA_U64, __u64, \

			nla_get_u64, NLA_PUT_U64, false)

			nla_get_u64, nla_put_u64, false)

#define __str_field(attr_nr, attr_flag, name, maxlen) \

	__array(attr_nr, attr_flag, name, NLA_NUL_STRING, char, maxlen, \

			nla_strlcpy, NLA_PUT, false)

			nla_strlcpy, nla_put, false)

#define __bin_field(attr_nr, attr_flag, name, maxlen) \

	__array(attr_nr, attr_flag, name, NLA_BINARY, char, maxlen, \

			nla_memcpy, NLA_PUT, false)

			nla_memcpy, nla_put, false)



/* fields with default values */

#define __flg_field_def(attr_nr, attr_flag, name, default) \