diff options
| author | David Vrabel <david.vrabel@csr.com> | 2010-02-25 13:35:22 +0000 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2010-02-25 13:35:22 +0000 |
| commit | 03806fa20f6a081493a731a4b18ea66317f9f947 (patch) | |
| tree | 630796c65c501e3612253ee4d4af58082a5f984c /fs/ocfs2/dlm/dlmdomain.c | |
| parent | 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 (diff) | |
| parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
| download | blackbird-op-linux-03806fa20f6a081493a731a4b18ea66317f9f947.tar.gz blackbird-op-linux-03806fa20f6a081493a731a4b18ea66317f9f947.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'fs/ocfs2/dlm/dlmdomain.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index 0334000676d3..988c9055fd4e 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c @@ -816,7 +816,7 @@ static int dlm_query_join_handler(struct o2net_msg *msg, u32 len, void *data, } /* Once the dlm ctxt is marked as leaving then we don't want - * to be put in someone's domain map. + * to be put in someone's domain map. * Also, explicitly disallow joining at certain troublesome * times (ie. during recovery). */ if (dlm && dlm->dlm_state != DLM_CTXT_LEAVING) { |
