linux.git/drivers/block/drbd, branch v3.0-rc2

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

2011-05-25T16:15:35+00:00

* 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block: (110 commits)
  loop: handle on-demand devices correctly
  loop: limit 'max_part' module param to DISK_MAX_PARTS
  drbd: fix warning
  drbd: fix warning
  drbd: Fix spelling
  drbd: fix schedule in atomic
  drbd: Take a more conservative approach when deciding max_bio_size
  drbd: Fixed state transitions after async outdate-peer-handler returned
  drbd: Disallow the peer_disk_state to be D_OUTDATED while connected
  drbd: Fix for the connection problems on high latency links
  drbd: fix potential activity log refcount imbalance in error path
  drbd: Only downgrade the disk state in case of disk failures
  drbd: fix disconnect/reconnect loop, if ping-timeout == ping-int
  drbd: fix potential distributed deadlock
  lru_cache.h: fix comments referring to ts_ instead of lc_
  drbd: Fix for application IO with the on-io-error=pass-on policy
  xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
  xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
  xen/blkback: don't fail empty barrier requests
  xen/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()
  ...

drbd: fix warning

2011-05-24T08:38:33+00:00

In file included from drivers/block/drbd/drbd_main.c:54:                        drivers/block/drbd/drbd_int.h:1190: warning: parameter has incomplete type

Forward declarations of enums do not work.

Fix it unpleasantly by moving the prototype.

Cc: Jens Axboe 
Signed-off-by: Lars Ellenberg 
Signed-off-by: Philipp Reisner 
Signed-off-by: Andrew Morton

drbd: fix warning

2011-05-24T08:38:32+00:00

Signed-off-by: Philipp Reisner

drbd: Fix spelling

2011-05-24T08:21:29+00:00

Found these with the help of ispell -l.

Signed-off-by: Bart Van Assche 
Signed-off-by: Lars Ellenberg 
Signed-off-by: Philipp Reisner

drbd: fix schedule in atomic

2011-05-24T08:14:32+00:00

An administrative detach used to request a state change directly to D_DISKLESS,
first suspending IO to avoid the last put_ldev() occuring from an endio handler,
potentially in irq context.

This is not enough on the receiving side (typically secondary), we may miss
some peer_req on the way to local disk, which then may do the last put_ldev()
from their drbd_peer_request_endio().

This patch makes the detach always go through the intermediate D_FAILED state.
We may consider to rename it D_DETACHING.

Alternative approach would be to create yet an other work item to be scheduled
on the worker, do the destructor work from there, and get the timing right.

manually picked commit 564040f from the drbd 8.4 branch.

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

drbd: Take a more conservative approach when deciding max_bio_size

2011-05-24T08:08:58+00:00

The old (optimistic) implementation could shrink the bio size
on an primary device.

Shrinking the bio size on a primary device is bad. Since there
we might get BIOs with the old (bigger) size shortly after
we published the new size.

The new implementation is more conservative, and eventually
increases the max_bio_size on a primary device (which is valid).
It does so, when it knows the local limit AND the remote limit.

 We cache the last seen max_bio_size of the peer in the meta
 data, and rely on that, to make the operation of single
 nodes more efficient.

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

drbd: Fixed state transitions after async outdate-peer-handler returned

2011-05-24T08:08:11+00:00

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

drbd: Disallow the peer_disk_state to be D_OUTDATED while connected

2011-05-24T08:07:50+00:00

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

drbd: Fix for the connection problems on high latency links

2011-05-24T08:07:22+00:00

It seems that the real cause of all the issues where that
we did not noticed in drbd_try_connect() when the other
guy closes one socket if the round trip time gets higher
than 100ms. There were that 100ms hard coded!

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

drbd: fix potential activity log refcount imbalance in error path

2011-05-24T08:06:44+00:00

It is no longer sufficient to trigger on local WRITE,
we need to check on (rq_state & RQ_IN_ACT_LOG)
before calling drbd_al_complete_io also in the error path.

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