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

Commit e75437fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.18/drivers' of git://git.kernel.dk/linux-block 

Pull block layer driver update from Jens Axboe:
 "This is the block driver pull request for 3.18.  Not a lot in there
  this round, and nothing earth shattering.

   - A round of drbd fixes from the linbit team, and an improvement in
     asender performance.

   - Removal of deprecated (and unused) IRQF_DISABLED flag in rsxx and
     hd from Michael Opdenacker.

   - Disable entropy collection from flash devices by default, from Mike
     Snitzer.

   - A small collection of xen blkfront/back fixes from Roger Pau Monné
     and Vitaly Kuznetsov"

* 'for-3.18/drivers' of git://git.kernel.dk/linux-block:
  block: disable entropy contributions for nonrot devices
  xen, blkfront: factor out flush-related checks from do_blkif_request()
  xen-blkback: fix leak on grant map error path
  xen/blkback: unmap all persistent grants when frontend gets disconnected
  rsxx: Remove deprecated IRQF_DISABLED
  block: hd: remove deprecated IRQF_DISABLED
  drbd: use RB_DECLARE_CALLBACKS() to define augment callbacks
  drbd: compute the end before rb_insert_augmented()
  drbd: Add missing newline in resync progress display in /proc/drbd
  drbd: reduce lock contention in drbd_worker
  drbd: Improve asender performance
  drbd: Get rid of the WORK_PENDING macro
  drbd: Get rid of the __no_warn and __cond_lock macros
  drbd: Avoid inconsistent locking warning
  drbd: Remove superfluous newline from "resync_extents" debugfs entry.
  drbd: Use consistent names for all the bi_end_io callbacks
  drbd: Use better variable names
parents d3dc366b b277da0a

drivers/block/drbd/drbd_actlog.c

+2 −2
Original line number Diff line number Diff line
@@ -158,14 +158,14 @@ static int _drbd_md_sync_page_io(struct drbd_device *device, 
	if (bio_add_page(bio, device->md_io.page, size, 0) != size)

		goto out;

	bio->bi_private = device;

	bio->bi_end_io = drbd_md_io_complete;

	bio->bi_end_io = drbd_md_endio;

	bio->bi_rw = rw;



	if (!(rw & WRITE) && device->state.disk == D_DISKLESS && device->ldev == NULL)

		/* special case, drbd_md_read() during drbd_adm_attach(): no get_ldev */

		;

	else if (!get_ldev_if_state(device, D_ATTACHING)) {

		/* Corresponding put_ldev in drbd_md_io_complete() */

		/* Corresponding put_ldev in drbd_md_endio() */

		drbd_err(device, "ASSERT FAILED: get_ldev_if_state() == 1 in _drbd_md_sync_page_io()\n");

		err = -ENODEV;

		goto out;

drivers/block/drbd/drbd_bitmap.c

+3 −3
Original line number Diff line number Diff line
@@ -941,7 +941,7 @@ static void drbd_bm_aio_ctx_destroy(struct kref *kref) 
}



/* bv_page may be a copy, or may be the original */

static void bm_async_io_complete(struct bio *bio, int error)

static void drbd_bm_endio(struct bio *bio, int error)

{

	struct drbd_bm_aio_ctx *ctx = bio->bi_private;

	struct drbd_device *device = ctx->device;
@@ -1027,7 +1027,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho 
	 * according to api.  Do we want to assert that? */

	bio_add_page(bio, page, len, 0);

	bio->bi_private = ctx;

	bio->bi_end_io = bm_async_io_complete;

	bio->bi_end_io = drbd_bm_endio;



	if (drbd_insert_fault(device, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) {

		bio->bi_rw |= rw;
@@ -1125,7 +1125,7 @@ static int bm_rw(struct drbd_device *device, const unsigned int flags, unsigned 
	}



	/*

	 * We initialize ctx->in_flight to one to make sure bm_async_io_complete

	 * We initialize ctx->in_flight to one to make sure drbd_bm_endio

	 * will not set ctx->done early, and decrement / test it here.  If there

	 * are still some bios in flight, we need to wait for them here.

	 * If all IO is done already (or nothing had been submitted), there is

drivers/block/drbd/drbd_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ static void resync_dump_detail(struct seq_file *m, struct lc_element *e) 
{

       struct bm_extent *bme = lc_entry(e, struct bm_extent, lce);



       seq_printf(m, "%5d %s %s %s\n", bme->rs_left,

       seq_printf(m, "%5d %s %s %s", bme->rs_left,

		  test_bit(BME_NO_WRITES, &bme->flags) ? "NO_WRITES" : "---------",

		  test_bit(BME_LOCKED, &bme->flags) ? "LOCKED" : "------",

		  test_bit(BME_PRIORITY, &bme->flags) ? "PRIORITY" : "--------"

drivers/block/drbd/drbd_int.h

+10 −9
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ 
# define __must_hold(x)

#endif



#define __no_warn(lock, stmt) do { __acquire(lock); stmt; __release(lock); } while (0)



/* module parameter, defined in drbd_main.c */

extern unsigned int minor_count;

extern bool disable_sendpage;
@@ -1483,7 +1481,7 @@ extern int drbd_khelper(struct drbd_device *device, char *cmd); 


/* drbd_worker.c */

/* bi_end_io handlers */

extern void drbd_md_io_complete(struct bio *bio, int error);

extern void drbd_md_endio(struct bio *bio, int error);

extern void drbd_peer_request_endio(struct bio *bio, int error);

extern void drbd_request_endio(struct bio *bio, int error);

extern int drbd_worker(struct drbd_thread *thi);
@@ -2100,16 +2098,19 @@ static inline bool is_sync_state(enum drbd_conns connection_state) 


/**

 * get_ldev() - Increase the ref count on device->ldev. Returns 0 if there is no ldev

 * @M:		DRBD device.

 * @_device:		DRBD device.

 * @_min_state:		Minimum device state required for success.

 *

 * You have to call put_ldev() when finished working with device->ldev.

 */

#define get_ldev(M) __cond_lock(local, _get_ldev_if_state(M,D_INCONSISTENT))

#define get_ldev_if_state(M,MINS) __cond_lock(local, _get_ldev_if_state(M,MINS))

#define get_ldev_if_state(_device, _min_state)				\

	(_get_ldev_if_state((_device), (_min_state)) ?			\

	 ({ __acquire(x); true; }) : false)

#define get_ldev(_device) get_ldev_if_state(_device, D_INCONSISTENT)



static inline void put_ldev(struct drbd_device *device)

{

	enum drbd_disk_state ds = device->state.disk;

	enum drbd_disk_state disk_state = device->state.disk;

	/* We must check the state *before* the atomic_dec becomes visible,

	 * or we have a theoretical race where someone hitting zero,

	 * while state still D_FAILED, will then see D_DISKLESS in the
@@ -2122,10 +2123,10 @@ static inline void put_ldev(struct drbd_device *device) 
	__release(local);

	D_ASSERT(device, i >= 0);

	if (i == 0) {

		if (ds == D_DISKLESS)

		if (disk_state == D_DISKLESS)

			/* even internal references gone, safe to destroy */

			drbd_device_post_work(device, DESTROY_DISK);

		if (ds == D_FAILED)

		if (disk_state == D_FAILED)

			/* all application IO references gone. */

			if (!test_and_set_bit(GOING_DISKLESS, &device->flags))

				drbd_device_post_work(device, GO_DISKLESS);

drivers/block/drbd/drbd_interval.c

+6 −34
Original line number Diff line number Diff line
@@ -37,40 +37,8 @@ compute_subtree_last(struct drbd_interval *node) 
	return max;

}



static void augment_propagate(struct rb_node *rb, struct rb_node *stop)

{

	while (rb != stop) {

		struct drbd_interval *node = rb_entry(rb, struct drbd_interval, rb);

		sector_t subtree_last = compute_subtree_last(node);

		if (node->end == subtree_last)

			break;

		node->end = subtree_last;

		rb = rb_parent(&node->rb);

	}

}



static void augment_copy(struct rb_node *rb_old, struct rb_node *rb_new)

{

	struct drbd_interval *old = rb_entry(rb_old, struct drbd_interval, rb);

	struct drbd_interval *new = rb_entry(rb_new, struct drbd_interval, rb);



	new->end = old->end;

}



static void augment_rotate(struct rb_node *rb_old, struct rb_node *rb_new)

{

	struct drbd_interval *old = rb_entry(rb_old, struct drbd_interval, rb);

	struct drbd_interval *new = rb_entry(rb_new, struct drbd_interval, rb);



	new->end = old->end;

	old->end = compute_subtree_last(old);

}



static const struct rb_augment_callbacks augment_callbacks = {

	augment_propagate,

	augment_copy,

	augment_rotate,

};

RB_DECLARE_CALLBACKS(static, augment_callbacks, struct drbd_interval, rb,

		     sector_t, end, compute_subtree_last);



/**

 * drbd_insert_interval  -  insert a new interval into a tree
@@ -79,6 +47,7 @@ bool 
drbd_insert_interval(struct rb_root *root, struct drbd_interval *this)

{

	struct rb_node **new = &root->rb_node, *parent = NULL;

	sector_t this_end = this->sector + (this->size >> 9);



	BUG_ON(!IS_ALIGNED(this->size, 512));
@@ -87,6 +56,8 @@ drbd_insert_interval(struct rb_root *root, struct drbd_interval *this) 
			rb_entry(*new, struct drbd_interval, rb);



		parent = *new;

		if (here->end < this_end)

			here->end = this_end;

		if (this->sector < here->sector)

			new = &(*new)->rb_left;

		else if (this->sector > here->sector)
@@ -99,6 +70,7 @@ drbd_insert_interval(struct rb_root *root, struct drbd_interval *this) 
			return false;

	}



	this->end = this_end;

	rb_link_node(&this->rb, parent, new);

	rb_insert_augmented(&this->rb, root, &augment_callbacks);

	return true;