From ebceb3bac955d89034da40a22816fe89dc54be89 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Thu, 6 Dec 2012 11:11:04 +0100 Subject: [PATCH] --- yaml --- r: 346297 b: refs/heads/master c: d2ec180c23a5a1bfe34d8638b0342a47c00cf70f h: refs/heads/master i: 346295: 7f48035f28ed320ae5d48f119a0e32f5c5eeb4e5 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/Kconfig | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 426f16e56e85..ac03fc10a819 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef86b77957a97315d43ff72c9b83361ba1a07963 +refs/heads/master: d2ec180c23a5a1bfe34d8638b0342a47c00cf70f diff --git a/trunk/drivers/block/drbd/Kconfig b/trunk/drivers/block/drbd/Kconfig index df0983787390..7845bd6ee414 100644 --- a/trunk/drivers/block/drbd/Kconfig +++ b/trunk/drivers/block/drbd/Kconfig @@ -2,13 +2,14 @@ # DRBD device driver configuration # -comment "DRBD disabled because PROC_FS, INET or CONNECTOR not selected" - depends on PROC_FS='n' || INET='n' || CONNECTOR='n' +comment "DRBD disabled because PROC_FS or INET not selected" + depends on PROC_FS='n' || INET='n' config BLK_DEV_DRBD tristate "DRBD Distributed Replicated Block Device support" - depends on PROC_FS && INET && CONNECTOR + depends on PROC_FS && INET select LRU_CACHE + select LIBCRC32C default n help @@ -58,7 +59,8 @@ config DRBD_FAULT_INJECTION 32 data read 64 read ahead 128 kmalloc of bitmap - 256 allocation of EE (epoch_entries) + 256 allocation of peer_requests + 512 insert data corruption on receiving side fault_devs: bitmask of minor numbers fault_rate: frequency in percent