The patch titled Subject: ocfs2: dlm: dlmdomain: remove unused function has been removed from the -mm tree. Its filename was ocfs2-dlm-dlmdomain-remove-unused-function.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Subject: ocfs2: dlm: dlmdomain: remove unused function Remove dlm_joined() that is not used anywhere. This was partially found by using a static code analysis program called cppcheck. Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/dlm/dlmdomain.c | 14 -------------- fs/ocfs2/dlm/dlmdomain.h | 1 - 2 files changed, 15 deletions(-) diff -puN fs/ocfs2/dlm/dlmdomain.c~ocfs2-dlm-dlmdomain-remove-unused-function fs/ocfs2/dlm/dlmdomain.c --- a/fs/ocfs2/dlm/dlmdomain.c~ocfs2-dlm-dlmdomain-remove-unused-function +++ a/fs/ocfs2/dlm/dlmdomain.c @@ -674,20 +674,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; diff -puN fs/ocfs2/dlm/dlmdomain.h~ocfs2-dlm-dlmdomain-remove-unused-function fs/ocfs2/dlm/dlmdomain.h --- a/fs/ocfs2/dlm/dlmdomain.h~ocfs2-dlm-dlmdomain-remove-unused-function +++ a/fs/ocfs2/dlm/dlmdomain.h @@ -28,7 +28,6 @@ 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); void dlm_fire_domain_eviction_callbacks(struct dlm_ctxt *dlm, int node_num); _ Patches currently in -mm which might be from rickard_strandqvist@xxxxxxxxxxxxxxxxxx are origin.patch arch-frv-mm-extablec-remove-unused-function.patch linux-next.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