litmus-rt.git/drivers/block, branch 2012.2

Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

2011-06-30T08:10:50+00:00

drbd: we should write meta data updates with FLUSH FUA

2011-06-30T07:23:46+00:00

We used to write these with BIO_RW_BARRIER aka REQ_HARDBARRIER (unless
disabled in the configuration). The correct semantic now would be to
write with FLUSH/FUA.
For example, with activity log transactions, FUA alone is not enough, we
need the corresponding bitmap update (and all related application
updates) on stable storage as well.

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

drbd: when receive times out on meta socket, also check last receive time on data socket

2011-06-30T07:23:44+00:00

If we have an asymetrically congested network, we may send P_PING,
but due to congestion, the corresponding P_PING_ACK would time out,
and we would drop a (congested, but otherwise) healthy connection
("PingAck did not arrive in time.")

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

drbd: account bitmap IO during resync as resync-(related-)-io

2011-06-30T07:23:43+00:00

If we have a good resync rate, we will frequently update the on-disk
bitmap, which, if not accounted for as resync io, may let an otherwise
idle device appear to be "busy", and cause us to throttle resync.

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

drbd: don't cond_resched_lock with IRQs disabled

2011-06-30T07:23:42+00:00

The last commit, drbd: add missing spinlock to bitmap receive,
introduced a cond_resched_lock(), where the lock in question is taken
with irqs disabled.

As we must not schedule with IRQs disabled,
and cond_resched_lock_irq() does not exist, yet,
we re-aquire the spin_lock_irq() for each bitmap page processed in turn.

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

drbd: add missing spinlock to bitmap receive

2011-06-30T07:23:41+00:00

During bitmap exchange, when using the RLE bitmap compression scheme,
we have a code path that can set the whole bitmap at once.

To avoid holding spin_lock_irq() for too long, we used to lock out other
bitmap modifications during bitmap exchange by other means, and then,
knowing we have exclusive access to the bitmap, modify it without
the spinlock, and with IRQs enabled.

Since we now allow local IO to continue, potentially setting additional
bits during the bitmap receive phase, this is no longer true, and we get
uncoordinated updates of bitmap members, causing bm_set to no longer
accurately reflect the total number of set bits.

To actually see this, you'd need to have a large bitmap, use RLE bitmap
compression, and have busy IO during sync handshake and bitmap exchange.

Fix this by taking the spin_lock_irq() in this code path as well, but
calling cond_resched_lock() after each page worth of bits processed.

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

drbd: Use the correct max_bio_size when creating resync requests

2011-06-30T07:23:40+00:00

Signed-off-by: Philipp Reisner 
Signed-off-by: Lars Ellenberg

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

2011-06-03T23:11:26+00:00

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Use hlist_entry() for io_context.cic_list.first
  cfq-iosched: Remove bogus check in queue_fail path
  xen/blkback: potential null dereference in error handling
  xen/blkback: don't call vbd_size() if bd_disk is NULL
  block: blkdev_get() should access ->bd_disk only after success
  CFQ: Fix typo and remove unnecessary semicolon
  block: remove unwanted semicolons
  Revert "block: Remove extra discard_alignment from hd_struct."
  nbd: adjust 'max_part' according to part_shift
  nbd: limit module parameters to a sane value
  nbd: pass MSG_* flags to kernel_recvmsg()
  block: improve the bio_add_page() and bio_add_pc_page() descriptions

block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal

2011-06-01T20:29:19+00:00

Jens' back-merge commit 698567f3fa79 ("Merge commit 'v2.6.39' into
for-2.6.40/core") was incorrectly done, and re-introduced the
DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits

 - 9fd097b14918 ("block: unexport DISK_EVENT_MEDIA_CHANGE for
   legacy/fringe drivers")

 - 7eec77a1816a ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd
   and ide-cd")

because of conflicts with the "g->flags" updates near-by by commit
d4dc210f69bc ("block: don't block events on excl write for non-optical
devices")

As a result, we re-introduced the hanging behavior due to infinite disk
media change reports.

Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't
do them to hide merge conflicts from me - especially as I'm likely
better at merging them than you are, since I do so many merges.

Reported-by: Steven Rostedt 
Cc: Jens Axboe 
Signed-off-by: Linus Torvalds

xen/blkback: potential null dereference in error handling

2011-06-01T13:28:21+00:00

blkbk->pending_pages can be NULL here so I added a check for it.

Signed-off-by: Dan Carpenter 
[v1: Redid the loop a bit]
Signed-off-by: Konrad Rzeszutek Wilk