+++ /dev/null
-From: Sunil Mushran <sunil.mushran@oracle.com>
-Date: Thu, 26 Feb 2009 15:00:42 -0800
-Subject: ocfs2/dlm: Indent dlm_cleanup_master_list()
-Patch-mainline: 2.6.30
-References: bnc#408304
-
-The previous patch explicitly did not indent dlm_cleanup_master_list()
-so as to make the patch readable. This patch properly indents the
-function.
-
-Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
-Signed-off-by: Mark Fasheh <mfasheh@suse.com>
----
- fs/ocfs2/dlm/dlmmaster.c | 106 ++++++++++++++++++++++-----------------------
- 1 files changed, 52 insertions(+), 54 deletions(-)
-
-Index: linux-2.6.27-sle11_ocfs2_update/fs/ocfs2/dlm/dlmmaster.c
-===================================================================
---- linux-2.6.27-sle11_ocfs2_update.orig/fs/ocfs2/dlm/dlmmaster.c
-+++ linux-2.6.27-sle11_ocfs2_update/fs/ocfs2/dlm/dlmmaster.c
-@@ -3298,66 +3298,64 @@ top:
- mle = hlist_entry(list, struct dlm_master_list_entry,
- master_hash_node);
-
-- BUG_ON(mle->type != DLM_MLE_BLOCK &&
-- mle->type != DLM_MLE_MASTER &&
-- mle->type != DLM_MLE_MIGRATION);
--
-- /* MASTER mles are initiated locally. the waiting
-- * process will notice the node map change
-- * shortly. let that happen as normal. */
-- if (mle->type == DLM_MLE_MASTER)
-- continue;
--
--
-- /* BLOCK mles are initiated by other nodes.
-- * need to clean up if the dead node would have
-- * been the master. */
-- if (mle->type == DLM_MLE_BLOCK) {
-- dlm_clean_block_mle(dlm, mle, dead_node);
-- continue;
-- }
--
-- /* everything else is a MIGRATION mle */
--
-- /* the rule for MIGRATION mles is that the master
-- * becomes UNKNOWN if *either* the original or
-- * the new master dies. all UNKNOWN lockreses
-- * are sent to whichever node becomes the recovery
-- * master. the new master is responsible for
-- * determining if there is still a master for
-- * this lockres, or if he needs to take over
-- * mastery. either way, this node should expect
-- * another message to resolve this. */
-- if (mle->master != dead_node &&
-- mle->new_master != dead_node)
-- continue;
--
-- /* if we have reached this point, this mle needs to
-- * be removed from the list and freed. */
-- dlm_clean_migration_mle(dlm, mle);
--
-- mlog(0, "%s: node %u died during migration from "
-- "%u to %u!\n", dlm->name, dead_node,
-- mle->master, mle->new_master);
--
-- /* If we find a lockres associated with the mle, we've
-- * hit this rare case that messes up our lock ordering.
-- * If so, we need to drop the master lock so that we can
-- * take the lockres lock, meaning that we will have to
-- * restart from the head of list. */
-- res = dlm_reset_mleres_owner(dlm, mle);
-- if (res)
-- /* restart */
-- goto top;
-+ BUG_ON(mle->type != DLM_MLE_BLOCK &&
-+ mle->type != DLM_MLE_MASTER &&
-+ mle->type != DLM_MLE_MIGRATION);
-+
-+ /* MASTER mles are initiated locally. The waiting
-+ * process will notice the node map change shortly.
-+ * Let that happen as normal. */
-+ if (mle->type == DLM_MLE_MASTER)
-+ continue;
-+
-+ /* BLOCK mles are initiated by other nodes. Need to
-+ * clean up if the dead node would have been the
-+ * master. */
-+ if (mle->type == DLM_MLE_BLOCK) {
-+ dlm_clean_block_mle(dlm, mle, dead_node);
-+ continue;
-+ }
-+
-+ /* Everything else is a MIGRATION mle */
-+
-+ /* The rule for MIGRATION mles is that the master
-+ * becomes UNKNOWN if *either* the original or the new
-+ * master dies. All UNKNOWN lockres' are sent to
-+ * whichever node becomes the recovery master. The new
-+ * master is responsible for determining if there is
-+ * still a master for this lockres, or if he needs to
-+ * take over mastery. Either way, this node should
-+ * expect another message to resolve this. */
-+
-+ if (mle->master != dead_node &&
-+ mle->new_master != dead_node)
-+ continue;
-+
-+ /* If we have reached this point, this mle needs to be
-+ * removed from the list and freed. */
-+ dlm_clean_migration_mle(dlm, mle);
-+
-+ mlog(0, "%s: node %u died during migration from "
-+ "%u to %u!\n", dlm->name, dead_node, mle->master,
-+ mle->new_master);
-+
-+ /* If we find a lockres associated with the mle, we've
-+ * hit this rare case that messes up our lock ordering.
-+ * If so, we need to drop the master lock so that we can
-+ * take the lockres lock, meaning that we will have to
-+ * restart from the head of list. */
-+ res = dlm_reset_mleres_owner(dlm, mle);
-+ if (res)
-+ /* restart */
-+ goto top;
-
-- /* this may be the last reference */
-- __dlm_put_mle(mle);
-- }
-+ /* This may be the last reference */
-+ __dlm_put_mle(mle);
-+ }
- }
- spin_unlock(&dlm->master_lock);
- }
-
--
- int dlm_finish_migration(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,
- u8 old_master)
- {
projects / people / teissler / ipfire-2.x.git / blobdiff