The patch titled
Subject: ocfs2/dlm: don't handle migrate lockres if already in shutdown
has been removed from the -mm tree. Its filename was
ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown-v3.patch
This patch was dropped because it was folded into ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown.patch
------------------------------------------------------
From: piaojun <piaojun@xxxxxxxxxx>
Subject: ocfs2/dlm: don't handle migrate lockres if already in shutdown
Link: http://lkml.kernel.org/r/5A9CBD19.5020107@xxxxxxxxxx
Signed-off-by: Jun Piao <piaojun@xxxxxxxxxx>
Reviewed-by: Yiwen Jiang <jiangyiwen@xxxxxxxxxx>
Reviewed-by: Joseph Qi <jiangqi903@xxxxxxxxx>
Cc: Mark Fasheh <mark@xxxxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Changwei Ge <ge.changwei@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmdomain.c | 28 ----------------------------
fs/ocfs2/dlm/dlmdomain.h | 26 ++++++++++++++++++++++++--
2 files changed, 24 insertions(+), 30 deletions(-)
diff -puN fs/ocfs2/dlm/dlmdomain.c~ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown-v3 fs/ocfs2/dlm/dlmdomain.c
--- a/fs/ocfs2/dlm/dlmdomain.c~ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown-v3
+++ a/fs/ocfs2/dlm/dlmdomain.c
@@ -675,34 +675,6 @@ static void dlm_leave_domain(struct dlm_
spin_unlock(&dlm->spinlock);
}
-int dlm_joined(struct dlm_ctxt *dlm)
-{
- int ret = 0;
-
- spin_lock(&dlm_domain_lock);
-
- if (dlm->dlm_state == DLM_CTXT_JOINED)
- ret = 1;
-
- spin_unlock(&dlm_domain_lock);
-
- return ret;
-}
-
-int dlm_shutting_down(struct dlm_ctxt *dlm)
-{
- int ret = 0;
-
- spin_lock(&dlm_domain_lock);
-
- if (dlm->dlm_state == DLM_CTXT_IN_SHUTDOWN)
- ret = 1;
-
- spin_unlock(&dlm_domain_lock);
-
- return ret;
-}
-
void dlm_unregister_domain(struct dlm_ctxt *dlm)
{
int leave = 0;
diff -puN fs/ocfs2/dlm/dlmdomain.h~ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown-v3 fs/ocfs2/dlm/dlmdomain.h
--- a/fs/ocfs2/dlm/dlmdomain.h~ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown-v3
+++ a/fs/ocfs2/dlm/dlmdomain.h
@@ -28,8 +28,30 @@
extern spinlock_t dlm_domain_lock;
extern struct list_head dlm_domains;
-int dlm_joined(struct dlm_ctxt *dlm);
-int dlm_shutting_down(struct dlm_ctxt *dlm);
+static inline int dlm_joined(struct dlm_ctxt *dlm)
+{
+ int ret = 0;
+
+ spin_lock(&dlm_domain_lock);
+ if (dlm->dlm_state == DLM_CTXT_JOINED)
+ ret = 1;
+ spin_unlock(&dlm_domain_lock);
+
+ return ret;
+}
+
+static inline int dlm_shutting_down(struct dlm_ctxt *dlm)
+{
+ int ret = 0;
+
+ spin_lock(&dlm_domain_lock);
+ if (dlm->dlm_state == DLM_CTXT_IN_SHUTDOWN)
+ ret = 1;
+ spin_unlock(&dlm_domain_lock);
+
+ return ret;
+}
+
void dlm_fire_domain_eviction_callbacks(struct dlm_ctxt *dlm,
int node_num);
_
Patches currently in -mm which might be from piaojun@xxxxxxxxxx are
ocfs2-use-osb-instead-of-ocfs2_sb.patch
ocfs2-use-oi-instead-of-ocfs2_i.patch
ocfs2-clean-up-some-unused-function-declaration.patch
ocfs2-dlm-dont-handle-migrate-lockres-if-already-in-shutdown.patch
ocfs2-remove-unnecessary-null-pointer-check-before-kmem_cache_destroy.patch
ocfs2-dlm-wait-for-dlm-recovery-done-when-migrating-all-lock-resources.patch
ocfs2-o2hb-check-len-for-bio_add_page-to-avoid-getting-incorrect-bio.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
