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

Commit 24c4830c authored by Bart Van Assche's avatar Bart Van Assche Committed by Philipp Reisner
Browse files

drbd: Fix spelling 



Found these with the help of ispell -l.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent 9a0d9d03

drivers/block/drbd/drbd_bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
 *	as we are "attached" to a local disk, which at 32 GiB for 1PiB storage

 *	seems excessive.

 *

 *	We plan to reduce the amount of in-core bitmap pages by pageing them in

 *	We plan to reduce the amount of in-core bitmap pages by paging them in

 *	and out against their on-disk location as necessary, but need to make

 *	sure we don't cause too much meta data IO, and must not deadlock in

 *	tight memory situations. This needs some more work.
@@ -200,7 +200,7 @@ void drbd_bm_unlock(struct drbd_conf *mdev) 
 * we if bits have been cleared since last IO. */

#define BM_PAGE_LAZY_WRITEOUT	28



/* store_page_idx uses non-atomic assingment. It is only used directly after

/* store_page_idx uses non-atomic assignment. It is only used directly after

 * allocating the page.  All other bm_set_page_* and bm_clear_page_* need to

 * use atomic bit manipulation, as set_out_of_sync (and therefore bitmap

 * changes) may happen from various contexts, and wait_on_bit/wake_up_bit
@@ -318,7 +318,7 @@ static void bm_unmap(unsigned long *p_addr) 
/* word offset from start of bitmap to word number _in_page_

 * modulo longs per page

#define MLPP(X) ((X) % (PAGE_SIZE/sizeof(long))

 hm, well, Philipp thinks gcc might not optimze the % into & (... - 1)

 hm, well, Philipp thinks gcc might not optimize the % into & (... - 1)

 so do it explicitly:

 */

#define MLPP(X) ((X) & ((PAGE_SIZE/sizeof(long))-1))

drivers/block/drbd/drbd_int.h

+3 −3
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ struct drbd_request { 
	 * see drbd_endio_pri(). */

	struct bio *private_bio;



	struct hlist_node colision;

	struct hlist_node collision;

	sector_t sector;

	unsigned int size;

	unsigned int epoch; /* barrier_nr */
@@ -765,7 +765,7 @@ struct digest_info { 


struct drbd_epoch_entry {

	struct drbd_work w;

	struct hlist_node colision;

	struct hlist_node collision;

	struct drbd_epoch *epoch; /* for writes */

	struct drbd_conf *mdev;

	struct page *pages;
@@ -1520,7 +1520,7 @@ extern void drbd_resume_io(struct drbd_conf *mdev); 
extern char *ppsize(char *buf, unsigned long long size);

extern sector_t drbd_new_dev_size(struct drbd_conf *, struct drbd_backing_dev *, int);

enum determine_dev_size { dev_size_error = -1, unchanged = 0, shrunk = 1, grew = 2 };

extern enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *, enum dds_flags) __must_hold(local);

extern enum determine_dev_size drbd_determine_dev_size(struct drbd_conf *, enum dds_flags) __must_hold(local);

extern void resync_after_online_grow(struct drbd_conf *);

extern void drbd_reconsider_max_bio_size(struct drbd_conf *mdev);

extern enum drbd_state_rv drbd_set_role(struct drbd_conf *mdev,

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2732,7 +2732,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) 


		/* double check digest, sometimes buffers have been modified in flight. */

		if (dgs > 0 && dgs <= 64) {

			/* 64 byte, 512 bit, is the larges digest size

			/* 64 byte, 512 bit, is the largest digest size

			 * currently supported in kernel crypto. */

			unsigned char digest[64];

			drbd_csum_bio(mdev, mdev->integrity_w_tfm, req->master_bio, digest);
@@ -3287,7 +3287,7 @@ static void drbd_delete_device(unsigned int minor) 


	drbd_release_ee_lists(mdev);



	/* should be free'd on disconnect? */

	/* should be freed on disconnect? */

	kfree(mdev->ee_hash);

	/*

	mdev->ee_hash_s = 0;

drivers/block/drbd/drbd_nl.c

+3 −3
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ void drbd_resume_io(struct drbd_conf *mdev) 
 * Returns 0 on success, negative return values indicate errors.

 * You should call drbd_md_sync() after calling this function.

 */

enum determine_dev_size drbd_determin_dev_size(struct drbd_conf *mdev, enum dds_flags flags) __must_hold(local)

enum determine_dev_size drbd_determine_dev_size(struct drbd_conf *mdev, enum dds_flags flags) __must_hold(local)

{

	sector_t prev_first_sect, prev_size; /* previous meta location */

	sector_t la_size;
@@ -1205,7 +1205,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp 
	    !drbd_md_test_flag(mdev->ldev, MDF_CONNECTED_IND))

		set_bit(USE_DEGR_WFC_T, &mdev->flags);



	dd = drbd_determin_dev_size(mdev, 0);

	dd = drbd_determine_dev_size(mdev, 0);

	if (dd == dev_size_error) {

		retcode = ERR_NOMEM_BITMAP;

		goto force_diskless_dec;
@@ -1719,7 +1719,7 @@ static int drbd_nl_resize(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp, 


	mdev->ldev->dc.disk_size = (sector_t)rs.resize_size;

	ddsf = (rs.resize_force ? DDSF_FORCED : 0) | (rs.no_resync ? DDSF_NO_RESYNC : 0);

	dd = drbd_determin_dev_size(mdev, ddsf);

	dd = drbd_determine_dev_size(mdev, ddsf);

	drbd_md_sync(mdev);

	put_ldev(mdev);

	if (dd == dev_size_error) {

drivers/block/drbd/drbd_receiver.c

+15 −15
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, 
	if (!page)

		goto fail;



	INIT_HLIST_NODE(&e->colision);

	INIT_HLIST_NODE(&e->collision);

	e->epoch = NULL;

	e->mdev = mdev;

	e->pages = page;
@@ -356,7 +356,7 @@ void drbd_free_some_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e, int i 
		kfree(e->digest);

	drbd_pp_free(mdev, e->pages, is_net);

	D_ASSERT(atomic_read(&e->pending_bios) == 0);

	D_ASSERT(hlist_unhashed(&e->colision));

	D_ASSERT(hlist_unhashed(&e->collision));

	mempool_free(e, drbd_ee_mempool);

}
@@ -1413,7 +1413,7 @@ static int e_end_resync_block(struct drbd_conf *mdev, struct drbd_work *w, int u 
	sector_t sector = e->sector;

	int ok;



	D_ASSERT(hlist_unhashed(&e->colision));

	D_ASSERT(hlist_unhashed(&e->collision));



	if (likely((e->flags & EE_WAS_ERROR) == 0)) {

		drbd_set_in_sync(mdev, sector, e->size);
@@ -1482,7 +1482,7 @@ static int receive_DataReply(struct drbd_conf *mdev, enum drbd_packets cmd, unsi 
		return false;

	}



	/* hlist_del(&req->colision) is done in _req_may_be_done, to avoid

	/* hlist_del(&req->collision) is done in _req_may_be_done, to avoid

	 * special casing it there for the various failure cases.

	 * still no race with drbd_fail_pending_reads */

	ok = recv_dless_read(mdev, req, sector, data_size);
@@ -1553,11 +1553,11 @@ static int e_end_block(struct drbd_conf *mdev, struct drbd_work *w, int cancel) 
	 * P_WRITE_ACK / P_NEG_ACK, to get the sequence number right.  */

	if (mdev->net_conf->two_primaries) {

		spin_lock_irq(&mdev->req_lock);

		D_ASSERT(!hlist_unhashed(&e->colision));

		hlist_del_init(&e->colision);

		D_ASSERT(!hlist_unhashed(&e->collision));

		hlist_del_init(&e->collision);

		spin_unlock_irq(&mdev->req_lock);

	} else {

		D_ASSERT(hlist_unhashed(&e->colision));

		D_ASSERT(hlist_unhashed(&e->collision));

	}



	drbd_may_finish_epoch(mdev, e->epoch, EV_PUT + (cancel ? EV_CLEANUP : 0));
@@ -1574,8 +1574,8 @@ static int e_send_discard_ack(struct drbd_conf *mdev, struct drbd_work *w, int u 
	ok = drbd_send_ack(mdev, P_DISCARD_ACK, e);



	spin_lock_irq(&mdev->req_lock);

	D_ASSERT(!hlist_unhashed(&e->colision));

	hlist_del_init(&e->colision);

	D_ASSERT(!hlist_unhashed(&e->collision));

	hlist_del_init(&e->collision);

	spin_unlock_irq(&mdev->req_lock);



	dec_unacked(mdev);
@@ -1750,7 +1750,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned 


		spin_lock_irq(&mdev->req_lock);



		hlist_add_head(&e->colision, ee_hash_slot(mdev, sector));

		hlist_add_head(&e->collision, ee_hash_slot(mdev, sector));



#define OVERLAPS overlaps(i->sector, i->size, sector, size)

		slot = tl_hash_slot(mdev, sector);
@@ -1760,7 +1760,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned 
			int have_conflict = 0;

			prepare_to_wait(&mdev->misc_wait, &wait,

				TASK_INTERRUPTIBLE);

			hlist_for_each_entry(i, n, slot, colision) {

			hlist_for_each_entry(i, n, slot, collision) {

				if (OVERLAPS) {

					/* only ALERT on first iteration,

					 * we may be woken up early... */
@@ -1799,7 +1799,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned 
			}



			if (signal_pending(current)) {

				hlist_del_init(&e->colision);

				hlist_del_init(&e->collision);



				spin_unlock_irq(&mdev->req_lock);
@@ -1857,7 +1857,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned 
	dev_err(DEV, "submit failed, triggering re-connect\n");

	spin_lock_irq(&mdev->req_lock);

	list_del(&e->w.list);

	hlist_del_init(&e->colision);

	hlist_del_init(&e->collision);

	spin_unlock_irq(&mdev->req_lock);

	if (e->flags & EE_CALL_AL_COMPLETE_IO)

		drbd_al_complete_io(mdev, e->sector);
@@ -2988,7 +2988,7 @@ static int receive_sizes(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned 


	ddsf = be16_to_cpu(p->dds_flags);

	if (get_ldev(mdev)) {

		dd = drbd_determin_dev_size(mdev, ddsf);

		dd = drbd_determine_dev_size(mdev, ddsf);

		put_ldev(mdev);

		if (dd == dev_size_error)

			return false;
@@ -4261,7 +4261,7 @@ static struct drbd_request *_ack_id_to_req(struct drbd_conf *mdev, 
	struct hlist_node *n;

	struct drbd_request *req;



	hlist_for_each_entry(req, n, slot, colision) {

	hlist_for_each_entry(req, n, slot, collision) {

		if ((unsigned long)req == (unsigned long)id) {

			if (req->sector != sector) {

				dev_err(DEV, "_ack_id_to_req: found req %p but it has "