summaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_proc.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2011-04-13 14:46:05 -0700
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:45:17 +0100
commitd3fcb4908d8cce7f29cff16bbef3b08933148003 (patch)
treefc457ab337f19aa265a3b5cc4d5bcacc5b664315 /drivers/block/drbd/drbd_proc.c
parentef356262846eb49821db7b20a131b6573e4c7d2e (diff)
downloadlinux-d3fcb4908d8cce7f29cff16bbef3b08933148003.tar.gz
linux-d3fcb4908d8cce7f29cff16bbef3b08933148003.tar.xz
drbd: protect all idr accesses that might sleep with drbd_cfg_rwsem
With this commit the locking for all accesses to IDRs is complete: * Non sleeping read accesses are protected by RCU * sleeping read accesses are protocted by a read lock on drbd_cfg_rwsem * accesses that add anything are protected by a write lock * accesses that remove an object are protoected by a write lock and a call to synchronize_rcu() after it is removed from the IDR and before the object is actually free()ed. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_proc.c')
-rw-r--r--drivers/block/drbd/drbd_proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index a4dbdbc52c15..4025d0883bad 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -227,6 +227,7 @@ static int drbd_seq_show(struct seq_file *seq, void *v)
oos .. known out-of-sync kB
*/
+ down_read(&drbd_cfg_rwsem);
idr_for_each_entry(&minors, mdev, i) {
if (prev_i != i - 1)
seq_printf(seq, "\n");
@@ -293,6 +294,7 @@ static int drbd_seq_show(struct seq_file *seq, void *v)
}
}
}
+ up_read(&drbd_cfg_rwsem);
return 0;
}