aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm/lowcomms.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 16:54:22 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 16:54:22 -0400
commit30d73f375238441d6dc31de0d90bc39f5bb0bfe5 (patch)
tree0a94e144fbb7d3fa84c443fb6cc61f2f01f61a1b /fs/dlm/lowcomms.c
parente2a0883e4071237d09b604a342c28b96b44a04b3 (diff)
parent1b189b8889b7d8e0bddc2655d171c43cfd344157 (diff)
Merge tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates for 3.4 from David Teigland: "This set includes one trivial fix, and one simple recovery speed up. Directory recovery can use the standard hash table to find resources rather than always searching the linear recovery list." * tag 'dlm-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: last element of dlm_local_addr[] never used dlm: fix slow rsb search in dir recovery
Diffstat (limited to 'fs/dlm/lowcomms.c')
-rw-r--r--fs/dlm/lowcomms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index ca0c59a4246c..133ef6dc7cb7 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -1076,7 +1076,7 @@ static void init_local(void)
1076 int i; 1076 int i;
1077 1077
1078 dlm_local_count = 0; 1078 dlm_local_count = 0;
1079 for (i = 0; i < DLM_MAX_ADDR_COUNT - 1; i++) { 1079 for (i = 0; i < DLM_MAX_ADDR_COUNT; i++) {
1080 if (dlm_our_addr(&sas, i)) 1080 if (dlm_our_addr(&sas, i))
1081 break; 1081 break;
1082 1082