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

Commit c1152949 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-linus

parents 08d869aa 367a8d73

drivers/block/drbd/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

#





comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected"

comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected"

	depends on !PROC_FS || !INET || !CONNECTOR

	depends on PROC_FS='n' || INET='n' || CONNECTOR='n'





config BLK_DEV_DRBD

config BLK_DEV_DRBD

	tristate "DRBD Distributed Replicated Block Device support"

	tristate "DRBD Distributed Replicated Block Device support"

drivers/block/drbd/drbd_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1298,6 +1298,7 @@ static void after_state_ch(struct drbd_conf *mdev, union drbd_state os, 
				dev_err(DEV, "Sending state in drbd_io_error() failed\n");

				dev_err(DEV, "Sending state in drbd_io_error() failed\n");

		}

		}





		wait_event(mdev->misc_wait, !atomic_read(&mdev->local_cnt));

		lc_destroy(mdev->resync);

		lc_destroy(mdev->resync);

		mdev->resync = NULL;

		mdev->resync = NULL;

		lc_destroy(mdev->act_log);

		lc_destroy(mdev->act_log);

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1271,7 +1271,7 @@ static int drbd_nl_net_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, 
			goto fail;

			goto fail;

		}

		}





		if (crypto_tfm_alg_type(crypto_hash_tfm(tfm)) != CRYPTO_ALG_TYPE_SHASH) {

		if (!drbd_crypto_is_hash(crypto_hash_tfm(tfm))) {

			retcode = ERR_AUTH_ALG_ND;

			retcode = ERR_AUTH_ALG_ND;

			goto fail;

			goto fail;

		}

		}

drivers/block/drbd/drbd_receiver.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -1201,10 +1201,11 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h) 




	case WO_bdev_flush:

	case WO_bdev_flush:

	case WO_drain_io:

	case WO_drain_io:

		D_ASSERT(rv == FE_STILL_LIVE);

		if (rv == FE_STILL_LIVE) {

			set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags);

			set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &mdev->current_epoch->flags);

			drbd_wait_ee_list_empty(mdev, &mdev->active_ee);

			drbd_wait_ee_list_empty(mdev, &mdev->active_ee);

			rv = drbd_flush_after_epoch(mdev, mdev->current_epoch);

			rv = drbd_flush_after_epoch(mdev, mdev->current_epoch);

		}

		if (rv == FE_RECYCLED)

		if (rv == FE_RECYCLED)

			return TRUE;

			return TRUE;