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

drbd: Rename struct drbd_conf -> struct drbd_device 



sed -i -e 's:\<drbd_conf\>:drbd_device:g'

Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
parent a3603a6e

drivers/block/drbd/drbd_actlog.c

+34 −34
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct update_al_work { 
};





void *drbd_md_get_buffer(struct drbd_conf *mdev)

void *drbd_md_get_buffer(struct drbd_device *mdev)

{

	int r;
@@ -116,13 +116,13 @@ void *drbd_md_get_buffer(struct drbd_conf *mdev) 
	return r ? NULL : page_address(mdev->md_io_page);

}



void drbd_md_put_buffer(struct drbd_conf *mdev)

void drbd_md_put_buffer(struct drbd_device *mdev)

{

	if (atomic_dec_and_test(&mdev->md_io_in_use))

		wake_up(&mdev->misc_wait);

}



void wait_until_done_or_force_detached(struct drbd_conf *mdev, struct drbd_backing_dev *bdev,

void wait_until_done_or_force_detached(struct drbd_device *mdev, struct drbd_backing_dev *bdev,

				     unsigned int *done)

{

	long dt;
@@ -142,7 +142,7 @@ void wait_until_done_or_force_detached(struct drbd_conf *mdev, struct drbd_backi 
	}

}



static int _drbd_md_sync_page_io(struct drbd_conf *mdev,

static int _drbd_md_sync_page_io(struct drbd_device *mdev,

				 struct drbd_backing_dev *bdev,

				 struct page *page, sector_t sector,

				 int rw, int size)
@@ -192,7 +192,7 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, 
	return err;

}



int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev,

int drbd_md_sync_page_io(struct drbd_device *mdev, struct drbd_backing_dev *bdev,

			 sector_t sector, int rw)

{

	int err;
@@ -222,7 +222,7 @@ int drbd_md_sync_page_io(struct drbd_conf *mdev, struct drbd_backing_dev *bdev, 
	return err;

}



static struct bm_extent *find_active_resync_extent(struct drbd_conf *mdev, unsigned int enr)

static struct bm_extent *find_active_resync_extent(struct drbd_device *mdev, unsigned int enr)

{

	struct lc_element *tmp;

	tmp = lc_find(mdev->resync, enr/AL_EXT_PER_BM_SECT);
@@ -234,7 +234,7 @@ static struct bm_extent *find_active_resync_extent(struct drbd_conf *mdev, unsig 
	return NULL;

}



static struct lc_element *_al_get(struct drbd_conf *mdev, unsigned int enr, bool nonblock)

static struct lc_element *_al_get(struct drbd_device *mdev, unsigned int enr, bool nonblock)

{

	struct lc_element *al_ext;

	struct bm_extent *bm_ext;
@@ -257,7 +257,7 @@ static struct lc_element *_al_get(struct drbd_conf *mdev, unsigned int enr, bool 
	return al_ext;

}



bool drbd_al_begin_io_fastpath(struct drbd_conf *mdev, struct drbd_interval *i)

bool drbd_al_begin_io_fastpath(struct drbd_device *mdev, struct drbd_interval *i)

{

	/* for bios crossing activity log extent boundaries,

	 * we may need to activate two extents in one go */
@@ -275,7 +275,7 @@ bool drbd_al_begin_io_fastpath(struct drbd_conf *mdev, struct drbd_interval *i) 
}



static

bool drbd_al_begin_io_prepare(struct drbd_conf *mdev, struct drbd_interval *i)

bool drbd_al_begin_io_prepare(struct drbd_device *mdev, struct drbd_interval *i)

{

	/* for bios crossing activity log extent boundaries,

	 * we may need to activate two extents in one go */
@@ -297,7 +297,7 @@ bool drbd_al_begin_io_prepare(struct drbd_conf *mdev, struct drbd_interval *i) 
	return need_transaction;

}



static int al_write_transaction(struct drbd_conf *mdev, bool delegate);

static int al_write_transaction(struct drbd_device *mdev, bool delegate);



/* When called through generic_make_request(), we must delegate

 * activity log I/O to the worker thread: a further request
@@ -311,7 +311,7 @@ static int al_write_transaction(struct drbd_conf *mdev, bool delegate); 
/*

 * @delegate:   delegate activity log I/O to the worker thread

 */

void drbd_al_begin_io_commit(struct drbd_conf *mdev, bool delegate)

void drbd_al_begin_io_commit(struct drbd_device *mdev, bool delegate)

{

	bool locked = false;
@@ -352,7 +352,7 @@ void drbd_al_begin_io_commit(struct drbd_conf *mdev, bool delegate) 
/*

 * @delegate:   delegate activity log I/O to the worker thread

 */

void drbd_al_begin_io(struct drbd_conf *mdev, struct drbd_interval *i, bool delegate)

void drbd_al_begin_io(struct drbd_device *mdev, struct drbd_interval *i, bool delegate)

{

	BUG_ON(delegate && current == mdev->tconn->worker.task);
@@ -360,7 +360,7 @@ void drbd_al_begin_io(struct drbd_conf *mdev, struct drbd_interval *i, bool dele 
		drbd_al_begin_io_commit(mdev, delegate);

}



int drbd_al_begin_io_nonblock(struct drbd_conf *mdev, struct drbd_interval *i)

int drbd_al_begin_io_nonblock(struct drbd_device *mdev, struct drbd_interval *i)

{

	struct lru_cache *al = mdev->act_log;

	/* for bios crossing activity log extent boundaries,
@@ -409,7 +409,7 @@ int drbd_al_begin_io_nonblock(struct drbd_conf *mdev, struct drbd_interval *i) 
	return 0;

}



void drbd_al_complete_io(struct drbd_conf *mdev, struct drbd_interval *i)

void drbd_al_complete_io(struct drbd_device *mdev, struct drbd_interval *i)

{

	/* for bios crossing activity log extent boundaries,

	 * we may need to activate two extents in one go */
@@ -461,7 +461,7 @@ static unsigned int rs_extent_to_bm_page(unsigned int rs_enr) 
		 (BM_EXT_SHIFT - BM_BLOCK_SHIFT));

}



static sector_t al_tr_number_to_on_disk_sector(struct drbd_conf *mdev)

static sector_t al_tr_number_to_on_disk_sector(struct drbd_device *mdev)

{

	const unsigned int stripes = mdev->ldev->md.al_stripes;

	const unsigned int stripe_size_4kB = mdev->ldev->md.al_stripe_size_4k;
@@ -480,7 +480,7 @@ static sector_t al_tr_number_to_on_disk_sector(struct drbd_conf *mdev) 
}



static int

_al_write_transaction(struct drbd_conf *mdev)

_al_write_transaction(struct drbd_device *mdev)

{

	struct al_transaction_on_disk *buffer;

	struct lc_element *e;
@@ -594,7 +594,7 @@ _al_write_transaction(struct drbd_conf *mdev) 
static int w_al_write_transaction(struct drbd_work *w, int unused)

{

	struct update_al_work *aw = container_of(w, struct update_al_work, w);

	struct drbd_conf *mdev = w->mdev;

	struct drbd_device *mdev = w->mdev;

	int err;



	err = _al_write_transaction(mdev);
@@ -607,7 +607,7 @@ static int w_al_write_transaction(struct drbd_work *w, int unused) 
/* Calls from worker context (see w_restart_disk_io()) need to write the

   transaction directly. Others came through generic_make_request(),

   those need to delegate it to the worker. */

static int al_write_transaction(struct drbd_conf *mdev, bool delegate)

static int al_write_transaction(struct drbd_device *mdev, bool delegate)

{

	if (delegate) {

		struct update_al_work al_work;
@@ -621,7 +621,7 @@ static int al_write_transaction(struct drbd_conf *mdev, bool delegate) 
		return _al_write_transaction(mdev);

}



static int _try_lc_del(struct drbd_conf *mdev, struct lc_element *al_ext)

static int _try_lc_del(struct drbd_device *mdev, struct lc_element *al_ext)

{

	int rv;
@@ -643,7 +643,7 @@ static int _try_lc_del(struct drbd_conf *mdev, struct lc_element *al_ext) 
 *

 * You need to lock mdev->act_log with lc_try_lock() / lc_unlock()

 */

void drbd_al_shrink(struct drbd_conf *mdev)

void drbd_al_shrink(struct drbd_device *mdev)

{

	struct lc_element *al_ext;

	int i;
@@ -660,7 +660,7 @@ void drbd_al_shrink(struct drbd_conf *mdev) 
	wake_up(&mdev->al_wait);

}



int drbd_initialize_al(struct drbd_conf *mdev, void *buffer)

int drbd_initialize_al(struct drbd_device *mdev, void *buffer)

{

	struct al_transaction_on_disk *al = buffer;

	struct drbd_md *md = &mdev->ldev->md;
@@ -684,7 +684,7 @@ int drbd_initialize_al(struct drbd_conf *mdev, void *buffer) 
static int w_update_odbm(struct drbd_work *w, int unused)

{

	struct update_odbm_work *udw = container_of(w, struct update_odbm_work, w);

	struct drbd_conf *mdev = w->mdev;

	struct drbd_device *mdev = w->mdev;

	struct sib_info sib = { .sib_reason = SIB_SYNC_PROGRESS, };



	if (!get_ldev(mdev)) {
@@ -721,7 +721,7 @@ static int w_update_odbm(struct drbd_work *w, int unused) 
 *

 * TODO will be obsoleted once we have a caching lru of the on disk bitmap

 */

static void drbd_try_clear_on_disk_bm(struct drbd_conf *mdev, sector_t sector,

static void drbd_try_clear_on_disk_bm(struct drbd_device *mdev, sector_t sector,

				      int count, int success)

{

	struct lc_element *e;
@@ -809,7 +809,7 @@ static void drbd_try_clear_on_disk_bm(struct drbd_conf *mdev, sector_t sector, 
	}

}



void drbd_advance_rs_marks(struct drbd_conf *mdev, unsigned long still_to_go)

void drbd_advance_rs_marks(struct drbd_device *mdev, unsigned long still_to_go)

{

	unsigned long now = jiffies;

	unsigned long last = mdev->rs_mark_time[mdev->rs_last_mark];
@@ -832,7 +832,7 @@ void drbd_advance_rs_marks(struct drbd_conf *mdev, unsigned long still_to_go) 
 * called by worker on C_SYNC_TARGET and receiver on SyncSource.

 *

 */

void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size,

void __drbd_set_in_sync(struct drbd_device *mdev, sector_t sector, int size,

		       const char *file, const unsigned int line)

{

	/* Is called from worker and receiver context _only_ */
@@ -904,7 +904,7 @@ void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size, 
 * called by tl_clear and drbd_send_dblock (==drbd_make_request).

 * so this can be _any_ process.

 */

int __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size,

int __drbd_set_out_of_sync(struct drbd_device *mdev, sector_t sector, int size,

			    const char *file, const unsigned int line)

{

	unsigned long sbnr, ebnr, flags;
@@ -956,7 +956,7 @@ int __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size, 
}



static

struct bm_extent *_bme_get(struct drbd_conf *mdev, unsigned int enr)

struct bm_extent *_bme_get(struct drbd_device *mdev, unsigned int enr)

{

	struct lc_element *e;

	struct bm_extent *bm_ext;
@@ -996,7 +996,7 @@ struct bm_extent *_bme_get(struct drbd_conf *mdev, unsigned int enr) 
	return bm_ext;

}



static int _is_in_al(struct drbd_conf *mdev, unsigned int enr)

static int _is_in_al(struct drbd_device *mdev, unsigned int enr)

{

	int rv;
@@ -1014,7 +1014,7 @@ static int _is_in_al(struct drbd_conf *mdev, unsigned int enr) 
 *

 * This functions sleeps on al_wait. Returns 0 on success, -EINTR if interrupted.

 */

int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector)

int drbd_rs_begin_io(struct drbd_device *mdev, sector_t sector)

{

	unsigned int enr = BM_SECT_TO_EXT(sector);

	struct bm_extent *bm_ext;
@@ -1067,7 +1067,7 @@ int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) 
 * tries to set it to BME_LOCKED. Returns 0 upon success, and -EAGAIN

 * if there is still application IO going on in this area.

 */

int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)

int drbd_try_rs_begin_io(struct drbd_device *mdev, sector_t sector)

{

	unsigned int enr = BM_SECT_TO_EXT(sector);

	const unsigned int al_enr = enr*AL_EXT_PER_BM_SECT;
@@ -1166,7 +1166,7 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) 
	return -EAGAIN;

}



void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector)

void drbd_rs_complete_io(struct drbd_device *mdev, sector_t sector)

{

	unsigned int enr = BM_SECT_TO_EXT(sector);

	struct lc_element *e;
@@ -1204,7 +1204,7 @@ void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector) 
 * drbd_rs_cancel_all() - Removes all extents from the resync LRU (even BME_LOCKED)

 * @mdev:	DRBD device.

 */

void drbd_rs_cancel_all(struct drbd_conf *mdev)

void drbd_rs_cancel_all(struct drbd_device *mdev)

{

	spin_lock_irq(&mdev->al_lock);
@@ -1225,7 +1225,7 @@ void drbd_rs_cancel_all(struct drbd_conf *mdev) 
 * Returns 0 upon success, -EAGAIN if at least one reference count was

 * not zero.

 */

int drbd_rs_del_all(struct drbd_conf *mdev)

int drbd_rs_del_all(struct drbd_device *mdev)

{

	struct lc_element *e;

	struct bm_extent *bm_ext;
@@ -1276,7 +1276,7 @@ int drbd_rs_del_all(struct drbd_conf *mdev) 
 * @sector:	The sector number.

 * @size:	Size of failed IO operation, in byte.

 */

void drbd_rs_failed_io(struct drbd_conf *mdev, sector_t sector, int size)

void drbd_rs_failed_io(struct drbd_device *mdev, sector_t sector, int size)

{

	/* Is called from worker and receiver context _only_ */

	unsigned long sbnr, ebnr, lbnr;

drivers/block/drbd/drbd_bitmap.c

+43 −43
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct drbd_bitmap { 
};



#define bm_print_lock_info(m) __bm_print_lock_info(m, __func__)

static void __bm_print_lock_info(struct drbd_conf *mdev, const char *func)

static void __bm_print_lock_info(struct drbd_device *mdev, const char *func)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!__ratelimit(&drbd_ratelimit_state))
@@ -124,7 +124,7 @@ static void __bm_print_lock_info(struct drbd_conf *mdev, const char *func) 
		drbd_task_to_thread_name(mdev->tconn, b->bm_task));

}



void drbd_bm_lock(struct drbd_conf *mdev, char *why, enum bm_flag flags)

void drbd_bm_lock(struct drbd_device *mdev, char *why, enum bm_flag flags)

{

	struct drbd_bitmap *b = mdev->bitmap;

	int trylock_failed;
@@ -151,7 +151,7 @@ void drbd_bm_lock(struct drbd_conf *mdev, char *why, enum bm_flag flags) 
	b->bm_task = current;

}



void drbd_bm_unlock(struct drbd_conf *mdev)

void drbd_bm_unlock(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!b) {
@@ -211,14 +211,14 @@ static unsigned long bm_page_to_idx(struct page *page) 
/* As is very unlikely that the same page is under IO from more than one

 * context, we can get away with a bit per page and one wait queue per bitmap.

 */

static void bm_page_lock_io(struct drbd_conf *mdev, int page_nr)

static void bm_page_lock_io(struct drbd_device *mdev, int page_nr)

{

	struct drbd_bitmap *b = mdev->bitmap;

	void *addr = &page_private(b->bm_pages[page_nr]);

	wait_event(b->bm_io_wait, !test_and_set_bit(BM_PAGE_IO_LOCK, addr));

}



static void bm_page_unlock_io(struct drbd_conf *mdev, int page_nr)

static void bm_page_unlock_io(struct drbd_device *mdev, int page_nr)

{

	struct drbd_bitmap *b = mdev->bitmap;

	void *addr = &page_private(b->bm_pages[page_nr]);
@@ -249,7 +249,7 @@ static void bm_set_page_need_writeout(struct page *page) 
 * hints, then call drbd_bm_write_hinted(), which will only write out changed

 * pages which are flagged with this mark.

 */

void drbd_bm_mark_for_writeout(struct drbd_conf *mdev, int page_nr)

void drbd_bm_mark_for_writeout(struct drbd_device *mdev, int page_nr)

{

	struct page *page;

	if (page_nr >= mdev->bitmap->bm_number_of_pages) {
@@ -340,7 +340,7 @@ static void bm_unmap(unsigned long *p_addr) 


/*

 * actually most functions herein should take a struct drbd_bitmap*, not a

 * struct drbd_conf*, but for the debug macros I like to have the mdev around

 * struct drbd_device*, but for the debug macros I like to have the mdev around

 * to be able to report device specific.

 */
@@ -438,7 +438,7 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) 
 * called on driver init only. TODO call when a device is created.

 * allocates the drbd_bitmap, and stores it in mdev->bitmap.

 */

int drbd_bm_init(struct drbd_conf *mdev)

int drbd_bm_init(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	WARN_ON(b != NULL);
@@ -454,7 +454,7 @@ int drbd_bm_init(struct drbd_conf *mdev) 
	return 0;

}



sector_t drbd_bm_capacity(struct drbd_conf *mdev)

sector_t drbd_bm_capacity(struct drbd_device *mdev)

{

	if (!expect(mdev->bitmap))

		return 0;
@@ -463,7 +463,7 @@ sector_t drbd_bm_capacity(struct drbd_conf *mdev) 


/* called on driver unload. TODO: call when a device is destroyed.

 */

void drbd_bm_cleanup(struct drbd_conf *mdev)

void drbd_bm_cleanup(struct drbd_device *mdev)

{

	if (!expect(mdev->bitmap))

		return;
@@ -631,7 +631,7 @@ static u64 drbd_md_on_disk_bits(struct drbd_backing_dev *ldev) 
 * In case this is actually a resize, we copy the old bitmap into the new one.

 * Otherwise, the bitmap is initialized to all bits set.

 */

int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits)

int drbd_bm_resize(struct drbd_device *mdev, sector_t capacity, int set_new_bits)

{

	struct drbd_bitmap *b = mdev->bitmap;

	unsigned long bits, words, owords, obits;
@@ -757,7 +757,7 @@ int drbd_bm_resize(struct drbd_conf *mdev, sector_t capacity, int set_new_bits) 
 *

 * maybe bm_set should be atomic_t ?

 */

unsigned long _drbd_bm_total_weight(struct drbd_conf *mdev)

unsigned long _drbd_bm_total_weight(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	unsigned long s;
@@ -775,7 +775,7 @@ unsigned long _drbd_bm_total_weight(struct drbd_conf *mdev) 
	return s;

}



unsigned long drbd_bm_total_weight(struct drbd_conf *mdev)

unsigned long drbd_bm_total_weight(struct drbd_device *mdev)

{

	unsigned long s;

	/* if I don't have a disk, I don't know about out-of-sync status */
@@ -786,7 +786,7 @@ unsigned long drbd_bm_total_weight(struct drbd_conf *mdev) 
	return s;

}



size_t drbd_bm_words(struct drbd_conf *mdev)

size_t drbd_bm_words(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!expect(b))
@@ -797,7 +797,7 @@ size_t drbd_bm_words(struct drbd_conf *mdev) 
	return b->bm_words;

}



unsigned long drbd_bm_bits(struct drbd_conf *mdev)

unsigned long drbd_bm_bits(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!expect(b))
@@ -811,7 +811,7 @@ unsigned long drbd_bm_bits(struct drbd_conf *mdev) 
 * bitmap must be locked by drbd_bm_lock.

 * currently only used from receive_bitmap.

 */

void drbd_bm_merge_lel(struct drbd_conf *mdev, size_t offset, size_t number,

void drbd_bm_merge_lel(struct drbd_device *mdev, size_t offset, size_t number,

			unsigned long *buffer)

{

	struct drbd_bitmap *b = mdev->bitmap;
@@ -860,7 +860,7 @@ void drbd_bm_merge_lel(struct drbd_conf *mdev, size_t offset, size_t number, 
/* copy number words from the bitmap starting at offset into the buffer.

 * buffer[i] will be little endian unsigned long.

 */

void drbd_bm_get_lel(struct drbd_conf *mdev, size_t offset, size_t number,

void drbd_bm_get_lel(struct drbd_device *mdev, size_t offset, size_t number,

		     unsigned long *buffer)

{

	struct drbd_bitmap *b = mdev->bitmap;
@@ -897,7 +897,7 @@ void drbd_bm_get_lel(struct drbd_conf *mdev, size_t offset, size_t number, 
}



/* set all bits in the bitmap */

void drbd_bm_set_all(struct drbd_conf *mdev)

void drbd_bm_set_all(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!expect(b))
@@ -913,7 +913,7 @@ void drbd_bm_set_all(struct drbd_conf *mdev) 
}



/* clear all bits in the bitmap */

void drbd_bm_clear_all(struct drbd_conf *mdev)

void drbd_bm_clear_all(struct drbd_device *mdev)

{

	struct drbd_bitmap *b = mdev->bitmap;

	if (!expect(b))
@@ -928,7 +928,7 @@ void drbd_bm_clear_all(struct drbd_conf *mdev) 
}



struct bm_aio_ctx {

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	atomic_t in_flight;

	unsigned int done;

	unsigned flags;
@@ -951,7 +951,7 @@ static void bm_aio_ctx_destroy(struct kref *kref) 
static void bm_async_io_complete(struct bio *bio, int error)

{

	struct bm_aio_ctx *ctx = bio->bi_private;

	struct drbd_conf *mdev = ctx->mdev;

	struct drbd_device *mdev = ctx->mdev;

	struct drbd_bitmap *b = mdev->bitmap;

	unsigned int idx = bm_page_to_idx(bio->bi_io_vec[0].bv_page);

	int uptodate = bio_flagged(bio, BIO_UPTODATE);
@@ -1000,7 +1000,7 @@ static void bm_async_io_complete(struct bio *bio, int error) 
static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must_hold(local)

{

	struct bio *bio = bio_alloc_drbd(GFP_NOIO);

	struct drbd_conf *mdev = ctx->mdev;

	struct drbd_device *mdev = ctx->mdev;

	struct drbd_bitmap *b = mdev->bitmap;

	struct page *page;

	unsigned int len;
@@ -1049,7 +1049,7 @@ static void bm_page_io_async(struct bm_aio_ctx *ctx, int page_nr, int rw) __must 
/*

 * bm_rw: read/write the whole bitmap from/to its on disk location.

 */

static int bm_rw(struct drbd_conf *mdev, int rw, unsigned flags, unsigned lazy_writeout_upper_idx) __must_hold(local)

static int bm_rw(struct drbd_device *mdev, int rw, unsigned flags, unsigned lazy_writeout_upper_idx) __must_hold(local)

{

	struct bm_aio_ctx *ctx;

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1173,7 +1173,7 @@ static int bm_rw(struct drbd_conf *mdev, int rw, unsigned flags, unsigned lazy_w 
 * drbd_bm_read() - Read the whole bitmap from its on disk location.

 * @mdev:	DRBD device.

 */

int drbd_bm_read(struct drbd_conf *mdev) __must_hold(local)

int drbd_bm_read(struct drbd_device *mdev) __must_hold(local)

{

	return bm_rw(mdev, READ, 0, 0);

}
@@ -1184,7 +1184,7 @@ int drbd_bm_read(struct drbd_conf *mdev) __must_hold(local) 
 *

 * Will only write pages that have changed since last IO.

 */

int drbd_bm_write(struct drbd_conf *mdev) __must_hold(local)

int drbd_bm_write(struct drbd_device *mdev) __must_hold(local)

{

	return bm_rw(mdev, WRITE, 0, 0);

}
@@ -1195,7 +1195,7 @@ int drbd_bm_write(struct drbd_conf *mdev) __must_hold(local) 
 *

 * Will write all pages.

 */

int drbd_bm_write_all(struct drbd_conf *mdev) __must_hold(local)

int drbd_bm_write_all(struct drbd_device *mdev) __must_hold(local)

{

	return bm_rw(mdev, WRITE, BM_WRITE_ALL_PAGES, 0);

}
@@ -1211,7 +1211,7 @@ int drbd_bm_write_all(struct drbd_conf *mdev) __must_hold(local) 
 * verify is aborted due to a failed peer disk, while local IO continues, or

 * pending resync acks are still being processed.

 */

int drbd_bm_write_copy_pages(struct drbd_conf *mdev) __must_hold(local)

int drbd_bm_write_copy_pages(struct drbd_device *mdev) __must_hold(local)

{

	return bm_rw(mdev, WRITE, BM_AIO_COPY_PAGES, 0);

}
@@ -1220,7 +1220,7 @@ int drbd_bm_write_copy_pages(struct drbd_conf *mdev) __must_hold(local) 
 * drbd_bm_write_hinted() - Write bitmap pages with "hint" marks, if they have changed.

 * @mdev:	DRBD device.

 */

int drbd_bm_write_hinted(struct drbd_conf *mdev) __must_hold(local)

int drbd_bm_write_hinted(struct drbd_device *mdev) __must_hold(local)

{

	return bm_rw(mdev, WRITE, BM_AIO_WRITE_HINTED | BM_AIO_COPY_PAGES, 0);

}
@@ -1237,7 +1237,7 @@ int drbd_bm_write_hinted(struct drbd_conf *mdev) __must_hold(local) 
 * In case this becomes an issue on systems with larger PAGE_SIZE,

 * we may want to change this again to write 4k aligned 4k pieces.

 */

int drbd_bm_write_page(struct drbd_conf *mdev, unsigned int idx) __must_hold(local)

int drbd_bm_write_page(struct drbd_device *mdev, unsigned int idx) __must_hold(local)

{

	struct bm_aio_ctx *ctx;

	int err;
@@ -1288,7 +1288,7 @@ int drbd_bm_write_page(struct drbd_conf *mdev, unsigned int idx) __must_hold(loc 
 *

 * this returns a bit number, NOT a sector!

 */

static unsigned long __bm_find_next(struct drbd_conf *mdev, unsigned long bm_fo,

static unsigned long __bm_find_next(struct drbd_device *mdev, unsigned long bm_fo,

	const int find_zero_bit)

{

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1328,7 +1328,7 @@ static unsigned long __bm_find_next(struct drbd_conf *mdev, unsigned long bm_fo, 
	return bm_fo;

}



static unsigned long bm_find_next(struct drbd_conf *mdev,

static unsigned long bm_find_next(struct drbd_device *mdev,

	unsigned long bm_fo, const int find_zero_bit)

{

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1349,14 +1349,14 @@ static unsigned long bm_find_next(struct drbd_conf *mdev, 
	return i;

}



unsigned long drbd_bm_find_next(struct drbd_conf *mdev, unsigned long bm_fo)

unsigned long drbd_bm_find_next(struct drbd_device *mdev, unsigned long bm_fo)

{

	return bm_find_next(mdev, bm_fo, 0);

}



#if 0

/* not yet needed for anything. */

unsigned long drbd_bm_find_next_zero(struct drbd_conf *mdev, unsigned long bm_fo)

unsigned long drbd_bm_find_next_zero(struct drbd_device *mdev, unsigned long bm_fo)

{

	return bm_find_next(mdev, bm_fo, 1);

}
@@ -1364,13 +1364,13 @@ unsigned long drbd_bm_find_next_zero(struct drbd_conf *mdev, unsigned long bm_fo 


/* does not spin_lock_irqsave.

 * you must take drbd_bm_lock() first */

unsigned long _drbd_bm_find_next(struct drbd_conf *mdev, unsigned long bm_fo)

unsigned long _drbd_bm_find_next(struct drbd_device *mdev, unsigned long bm_fo)

{

	/* WARN_ON(!(BM_DONT_SET & mdev->b->bm_flags)); */

	return __bm_find_next(mdev, bm_fo, 0);

}



unsigned long _drbd_bm_find_next_zero(struct drbd_conf *mdev, unsigned long bm_fo)

unsigned long _drbd_bm_find_next_zero(struct drbd_device *mdev, unsigned long bm_fo)

{

	/* WARN_ON(!(BM_DONT_SET & mdev->b->bm_flags)); */

	return __bm_find_next(mdev, bm_fo, 1);
@@ -1382,7 +1382,7 @@ unsigned long _drbd_bm_find_next_zero(struct drbd_conf *mdev, unsigned long bm_f 
 * wants bitnr, not sector.

 * expected to be called for only a few bits (e - s about BITS_PER_LONG).

 * Must hold bitmap lock already. */

static int __bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s,

static int __bm_change_bits_to(struct drbd_device *mdev, const unsigned long s,

	unsigned long e, int val)

{

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1431,7 +1431,7 @@ static int __bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s, 
 * for val != 0, we change 0 -> 1, return code positive

 * for val == 0, we change 1 -> 0, return code negative

 * wants bitnr, not sector */

static int bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s,

static int bm_change_bits_to(struct drbd_device *mdev, const unsigned long s,

	const unsigned long e, int val)

{

	unsigned long flags;
@@ -1454,13 +1454,13 @@ static int bm_change_bits_to(struct drbd_conf *mdev, const unsigned long s, 
}



/* returns number of bits changed 0 -> 1 */

int drbd_bm_set_bits(struct drbd_conf *mdev, const unsigned long s, const unsigned long e)

int drbd_bm_set_bits(struct drbd_device *mdev, const unsigned long s, const unsigned long e)

{

	return bm_change_bits_to(mdev, s, e, 1);

}



/* returns number of bits changed 1 -> 0 */

int drbd_bm_clear_bits(struct drbd_conf *mdev, const unsigned long s, const unsigned long e)

int drbd_bm_clear_bits(struct drbd_device *mdev, const unsigned long s, const unsigned long e)

{

	return -bm_change_bits_to(mdev, s, e, 0);

}
@@ -1494,7 +1494,7 @@ static inline void bm_set_full_words_within_one_page(struct drbd_bitmap *b, 
 * You must first drbd_bm_lock().

 * Can be called to set the whole bitmap in one go.

 * Sets bits from s to e _inclusive_. */

void _drbd_bm_set_bits(struct drbd_conf *mdev, const unsigned long s, const unsigned long e)

void _drbd_bm_set_bits(struct drbd_device *mdev, const unsigned long s, const unsigned long e)

{

	/* First set_bit from the first bit (s)

	 * up to the next long boundary (sl),
@@ -1574,7 +1574,7 @@ void _drbd_bm_set_bits(struct drbd_conf *mdev, const unsigned long s, const unsi 
 *  0 ... bit not set

 * -1 ... first out of bounds access, stop testing for bits!

 */

int drbd_bm_test_bit(struct drbd_conf *mdev, const unsigned long bitnr)

int drbd_bm_test_bit(struct drbd_device *mdev, const unsigned long bitnr)

{

	unsigned long flags;

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1605,7 +1605,7 @@ int drbd_bm_test_bit(struct drbd_conf *mdev, const unsigned long bitnr) 
}



/* returns number of bits set in the range [s, e] */

int drbd_bm_count_bits(struct drbd_conf *mdev, const unsigned long s, const unsigned long e)

int drbd_bm_count_bits(struct drbd_device *mdev, const unsigned long s, const unsigned long e)

{

	unsigned long flags;

	struct drbd_bitmap *b = mdev->bitmap;
@@ -1660,7 +1660,7 @@ int drbd_bm_count_bits(struct drbd_conf *mdev, const unsigned long s, const unsi 
 * reference count of some bitmap extent element from some lru instead...

 *

 */

int drbd_bm_e_weight(struct drbd_conf *mdev, unsigned long enr)

int drbd_bm_e_weight(struct drbd_device *mdev, unsigned long enr)

{

	struct drbd_bitmap *b = mdev->bitmap;

	int count, s, e;

drivers/block/drbd/drbd_int.h

+173 −173

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_main.c

+79 −79

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/drbd/drbd_nl.c

+34 −34
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static struct drbd_config_context { 
	/* pointer into reply buffer */

	struct drbd_genlmsghdr *reply_dh;

	/* resolved from attributes, if possible */

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	struct drbd_tconn *tconn;

} adm_ctx;
@@ -313,7 +313,7 @@ static void setup_khelper_env(struct drbd_tconn *tconn, char **envp) 
	snprintf(envp[3], 20, "DRBD_PEER_AF=%s", afs);

}



int drbd_khelper(struct drbd_conf *mdev, char *cmd)

int drbd_khelper(struct drbd_device *mdev, char *cmd)

{

	char *envp[] = { "HOME=/",

			"TERM=linux",
@@ -400,7 +400,7 @@ static int conn_khelper(struct drbd_tconn *tconn, char *cmd) 
static enum drbd_fencing_p highest_fencing_policy(struct drbd_tconn *tconn)

{

	enum drbd_fencing_p fp = FP_NOT_AVAIL;

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int vnr;



	rcu_read_lock();
@@ -534,7 +534,7 @@ void conn_try_outdate_peer_async(struct drbd_tconn *tconn) 
}



enum drbd_state_rv

drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)

drbd_set_role(struct drbd_device *mdev, enum drbd_role new_role, int force)

{

	const int max_tries = 4;

	enum drbd_state_rv rv = SS_UNKNOWN_ERROR;
@@ -729,7 +729,7 @@ int drbd_adm_set_role(struct sk_buff *skb, struct genl_info *info) 
 *  Activity log size used to be fixed 32kB,

 *  but is about to become configurable.

 */

static void drbd_md_set_sector_offsets(struct drbd_conf *mdev,

static void drbd_md_set_sector_offsets(struct drbd_device *mdev,

				       struct drbd_backing_dev *bdev)

{

	sector_t md_size_sect = 0;
@@ -807,7 +807,7 @@ char *ppsize(char *buf, unsigned long long size) 
 * and can be long lived.

 * This changes an mdev->flag, is triggered by drbd internals,

 * and should be short-lived. */

void drbd_suspend_io(struct drbd_conf *mdev)

void drbd_suspend_io(struct drbd_device *mdev)

{

	set_bit(SUSPEND_IO, &mdev->flags);

	if (drbd_suspended(mdev))
@@ -815,7 +815,7 @@ void drbd_suspend_io(struct drbd_conf *mdev) 
	wait_event(mdev->misc_wait, !atomic_read(&mdev->ap_bio_cnt));

}



void drbd_resume_io(struct drbd_conf *mdev)

void drbd_resume_io(struct drbd_device *mdev)

{

	clear_bit(SUSPEND_IO, &mdev->flags);

	wake_up(&mdev->misc_wait);
@@ -829,7 +829,7 @@ void drbd_resume_io(struct drbd_conf *mdev) 
 * You should call drbd_md_sync() after calling this function.

 */

enum determine_dev_size

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

drbd_determine_dev_size(struct drbd_device *mdev, enum dds_flags flags, struct resize_parms *rs) __must_hold(local)

{

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

	sector_t la_size_sect, u_size;
@@ -979,7 +979,7 @@ drbd_determine_dev_size(struct drbd_conf *mdev, enum dds_flags flags, struct res 
}



sector_t

drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev,

drbd_new_dev_size(struct drbd_device *mdev, struct drbd_backing_dev *bdev,

		  sector_t u_size, int assume_peer_has_space)

{

	sector_t p_size = mdev->p_size;   /* partner's disk size. */
@@ -1033,7 +1033,7 @@ drbd_new_dev_size(struct drbd_conf *mdev, struct drbd_backing_dev *bdev, 
 * failed, and 0 on success. You should call drbd_md_sync() after you called

 * this function.

 */

static int drbd_check_al_size(struct drbd_conf *mdev, struct disk_conf *dc)

static int drbd_check_al_size(struct drbd_device *mdev, struct disk_conf *dc)

{

	struct lru_cache *n, *t;

	struct lc_element *e;
@@ -1078,7 +1078,7 @@ static int drbd_check_al_size(struct drbd_conf *mdev, struct disk_conf *dc) 
	return 0;

}



static void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_bio_size)

static void drbd_setup_queue_param(struct drbd_device *mdev, unsigned int max_bio_size)

{

	struct request_queue * const q = mdev->rq_queue;

	unsigned int max_hw_sectors = max_bio_size >> 9;
@@ -1115,7 +1115,7 @@ static void drbd_setup_queue_param(struct drbd_conf *mdev, unsigned int max_bio_ 
	}

}



void drbd_reconsider_max_bio_size(struct drbd_conf *mdev)

void drbd_reconsider_max_bio_size(struct drbd_device *mdev)

{

	unsigned int now, new, local, peer;
@@ -1180,7 +1180,7 @@ static void conn_reconfig_done(struct drbd_tconn *tconn) 
}



/* Make sure IO is suspended before calling this function(). */

static void drbd_suspend_al(struct drbd_conf *mdev)

static void drbd_suspend_al(struct drbd_device *mdev)

{

	int s = 0;
@@ -1238,7 +1238,7 @@ static unsigned int drbd_al_extents_max(struct drbd_backing_dev *bdev) 
int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)

{

	enum drbd_ret_code retcode;

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	struct disk_conf *new_disk_conf, *old_disk_conf;

	struct fifo_buffer *old_plan = NULL, *new_plan = NULL;

	int err, fifo_size;
@@ -1366,7 +1366,7 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int err;

	enum drbd_ret_code retcode;

	enum determine_dev_size dd;
@@ -1800,7 +1800,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



static int adm_detach(struct drbd_conf *mdev, int force)

static int adm_detach(struct drbd_device *mdev, int force)

{

	enum drbd_state_rv retcode;

	int ret;
@@ -1862,7 +1862,7 @@ int drbd_adm_detach(struct sk_buff *skb, struct genl_info *info) 


static bool conn_resync_running(struct drbd_tconn *tconn)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	bool rv = false;

	int vnr;
@@ -1883,7 +1883,7 @@ static bool conn_resync_running(struct drbd_tconn *tconn) 


static bool conn_ov_running(struct drbd_tconn *tconn)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	bool rv = false;

	int vnr;
@@ -1903,7 +1903,7 @@ static bool conn_ov_running(struct drbd_tconn *tconn) 
static enum drbd_ret_code

_check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct net_conf *new_conf)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int i;



	if (old_conf && tconn->cstate == C_WF_REPORT_PARAMS && tconn->agreed_pro_version < 100) {
@@ -1947,7 +1947,7 @@ static enum drbd_ret_code 
check_net_options(struct drbd_tconn *tconn, struct net_conf *new_conf)

{

	static enum drbd_ret_code rv;

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int i;



	rcu_read_lock();
@@ -2139,7 +2139,7 @@ int drbd_adm_net_opts(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	struct net_conf *old_conf, *new_conf = NULL;

	struct crypto crypto = { };

	struct drbd_tconn *tconn;
@@ -2349,7 +2349,7 @@ int drbd_adm_disconnect(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



void resync_after_online_grow(struct drbd_conf *mdev)

void resync_after_online_grow(struct drbd_device *mdev)

{

	int iass; /* I am sync source */
@@ -2369,7 +2369,7 @@ int drbd_adm_resize(struct sk_buff *skb, struct genl_info *info) 
{

	struct disk_conf *old_disk_conf, *new_disk_conf = NULL;

	struct resize_parms rs;

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	enum drbd_ret_code retcode;

	enum determine_dev_size dd;

	bool change_al_layout = false;
@@ -2535,7 +2535,7 @@ int drbd_adm_resource_opts(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_invalidate(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int retcode; /* enum drbd_ret_code rsp. enum drbd_state_rv */



	retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);
@@ -2590,7 +2590,7 @@ static int drbd_adm_simple_request_state(struct sk_buff *skb, struct genl_info * 
	return 0;

}



static int drbd_bmio_set_susp_al(struct drbd_conf *mdev)

static int drbd_bmio_set_susp_al(struct drbd_device *mdev)

{

	int rv;
@@ -2602,7 +2602,7 @@ static int drbd_bmio_set_susp_al(struct drbd_conf *mdev) 
int drbd_adm_invalidate_peer(struct sk_buff *skb, struct genl_info *info)

{

	int retcode; /* drbd_ret_code, drbd_state_rv */

	struct drbd_conf *mdev;

	struct drbd_device *mdev;



	retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);

	if (!adm_ctx.reply_skb)
@@ -2692,7 +2692,7 @@ int drbd_adm_suspend_io(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_resume_io(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	int retcode; /* enum drbd_ret_code rsp. enum drbd_state_rv */



	retcode = drbd_adm_prepare(skb, info, DRBD_ADM_NEED_MINOR);
@@ -2753,7 +2753,7 @@ static int nla_put_drbd_cfg_context(struct sk_buff *skb, 
	return -EMSGSIZE;

}



static int nla_put_status_info(struct sk_buff *skb, struct drbd_conf *mdev,

static int nla_put_status_info(struct sk_buff *skb, struct drbd_device *mdev,

		const struct sib_info *sib)

{

	struct state_info *si = NULL; /* for sizeof(si->member); */
@@ -2897,7 +2897,7 @@ int drbd_adm_get_status(struct sk_buff *skb, struct genl_info *info) 


static int get_one_status(struct sk_buff *skb, struct netlink_callback *cb)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	struct drbd_genlmsghdr *dh;

	struct drbd_tconn *pos = (struct drbd_tconn*)cb->args[0];

	struct drbd_tconn *tconn = NULL;
@@ -3097,7 +3097,7 @@ int drbd_adm_get_timeout_type(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_start_ov(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	enum drbd_ret_code retcode;

	struct start_ov_parms parms;
@@ -3138,7 +3138,7 @@ int drbd_adm_start_ov(struct sk_buff *skb, struct genl_info *info) 


int drbd_adm_new_c_uuid(struct sk_buff *skb, struct genl_info *info)

{

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	enum drbd_ret_code retcode;

	int skip_initial_sync = 0;

	int err;
@@ -3302,7 +3302,7 @@ int drbd_adm_add_minor(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



static enum drbd_ret_code adm_delete_minor(struct drbd_conf *mdev)

static enum drbd_ret_code adm_delete_minor(struct drbd_device *mdev)

{

	if (mdev->state.disk == D_DISKLESS &&

	    /* no need to be mdev->state.conn == C_STANDALONE &&
@@ -3341,7 +3341,7 @@ int drbd_adm_delete_minor(struct sk_buff *skb, struct genl_info *info) 
int drbd_adm_down(struct sk_buff *skb, struct genl_info *info)

{

	int retcode; /* enum drbd_ret_code rsp. enum drbd_state_rv */

	struct drbd_conf *mdev;

	struct drbd_device *mdev;

	unsigned i;



	retcode = drbd_adm_prepare(skb, info, 0);
@@ -3441,7 +3441,7 @@ int drbd_adm_del_resource(struct sk_buff *skb, struct genl_info *info) 
	return 0;

}



void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)

void drbd_bcast_event(struct drbd_device *mdev, const struct sib_info *sib)

{

	static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */

	struct sk_buff *msg;