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

Commit 75e7b634 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.33

parents d9449ce3 35a8a3fd

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -733,7 +733,7 @@ void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_seg_s) __mu 
 */

 */

static void drbd_reconfig_start(struct drbd_conf *mdev)

static void drbd_reconfig_start(struct drbd_conf *mdev)

{

{

	wait_event(mdev->state_wait, test_and_set_bit(CONFIG_PENDING, &mdev->flags));

	wait_event(mdev->state_wait, !test_and_set_bit(CONFIG_PENDING, &mdev->flags));

	wait_event(mdev->state_wait, !test_bit(DEVICE_DYING, &mdev->flags));

	wait_event(mdev->state_wait, !test_bit(DEVICE_DYING, &mdev->flags));

	drbd_thread_start(&mdev->worker);

	drbd_thread_start(&mdev->worker);

}

}

drivers/block/drbd/drbd_receiver.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -2400,6 +2400,7 @@ static int drbd_uuid_compare(struct drbd_conf *mdev, int *rule_nr) __must_hold(l 








	*rule_nr = 80;

	*rule_nr = 80;

	peer = mdev->p_uuid[UI_CURRENT] & ~((u64)1);

	for (i = UI_HISTORY_START; i <= UI_HISTORY_END; i++) {

	for (i = UI_HISTORY_START; i <= UI_HISTORY_END; i++) {

		self = mdev->ldev->md.uuid[i] & ~((u64)1);

		self = mdev->ldev->md.uuid[i] & ~((u64)1);

		if (self == peer)

		if (self == peer)
@@ -3499,8 +3500,10 @@ static void drbdd(struct drbd_conf *mdev) 




	while (get_t_state(&mdev->receiver) == Running) {

	while (get_t_state(&mdev->receiver) == Running) {

		drbd_thread_current_set_cpu(mdev);

		drbd_thread_current_set_cpu(mdev);

		if (!drbd_recv_header(mdev, header))

		if (!drbd_recv_header(mdev, header)) {

			drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR));

			break;

			break;

		}





		if (header->command < P_MAX_CMD)

		if (header->command < P_MAX_CMD)

			handler = drbd_cmd_handler[header->command];

			handler = drbd_cmd_handler[header->command];

include/linux/connector.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ 
#define CN_DST_VAL			0x1

#define CN_DST_VAL			0x1

#define CN_IDX_DM			0x7	/* Device Mapper */

#define CN_IDX_DM			0x7	/* Device Mapper */

#define CN_VAL_DM_USERSPACE_LOG		0x1

#define CN_VAL_DM_USERSPACE_LOG		0x1

#define CN_IDX_DRBD			0x8

#define CN_VAL_DRBD			0x1





#define CN_NETLINK_USERS		8

#define CN_NETLINK_USERS		8

include/linux/drbd.h

+1 −8
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ 








extern const char *drbd_buildtag(void);

extern const char *drbd_buildtag(void);

#define REL_VERSION "8.3.5"

#define REL_VERSION "8.3.6"

#define API_VERSION 88

#define API_VERSION 88

#define PRO_VERSION_MIN 86

#define PRO_VERSION_MIN 86

#define PRO_VERSION_MAX 91

#define PRO_VERSION_MAX 91
@@ -322,13 +322,6 @@ enum drbd_timeout_flag { 
#define DRBD_NL_CREATE_DEVICE 0x01

#define DRBD_NL_CREATE_DEVICE 0x01

#define DRBD_NL_SET_DEFAULTS  0x02

#define DRBD_NL_SET_DEFAULTS  0x02





/* The following line should be moved over to linux/connector.h

 * when the time comes */

#ifndef CN_IDX_DRBD

# define CN_IDX_DRBD			0x4

/* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */

#endif

#define CN_VAL_DRBD			0x1





/* For searching a vacant cn_idx value */

/* For searching a vacant cn_idx value */

#define CN_IDX_STEP			6977

#define CN_IDX_STEP			6977