Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bcb654c authored by Changwei Ge's avatar Changwei Ge Committed by Linus Torvalds
Browse files

ocfs2/dlm: clean up unused argument for dlm_destroy_recovery_area() 

Link: http://lkml.kernel.org/r/1521116681-14602-1-git-send-email-ge.changwei@h3c.com


Signed-off-by: default avatarChangwei Ge <ge.changwei@h3c.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joseph Qi <jiangqi903@gmail.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Changwei Ge <ge.changwei@h3c.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 26ec1615

fs/ocfs2/dlm/dlmrecovery.c

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 dead_node); 
static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);

static int dlm_request_all_locks(struct dlm_ctxt *dlm,

				 u8 request_from, u8 dead_node);

static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node);

static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm);



static inline int dlm_num_locks_in_lockres(struct dlm_lock_resource *res);

static void dlm_init_migratable_lockres(struct dlm_migratable_lockres *mres,
@@ -739,7 +739,7 @@ static int dlm_remaster_locks(struct dlm_ctxt *dlm, u8 dead_node) 
	}



	if (destroy)

		dlm_destroy_recovery_area(dlm, dead_node);

		dlm_destroy_recovery_area(dlm);



	return status;

}
@@ -764,7 +764,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node) 


		ndata = kzalloc(sizeof(*ndata), GFP_NOFS);

		if (!ndata) {

			dlm_destroy_recovery_area(dlm, dead_node);

			dlm_destroy_recovery_area(dlm);

			return -ENOMEM;

		}

		ndata->node_num = num;
@@ -778,7 +778,7 @@ static int dlm_init_recovery_area(struct dlm_ctxt *dlm, u8 dead_node) 
	return 0;

}



static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm, u8 dead_node)

static void dlm_destroy_recovery_area(struct dlm_ctxt *dlm)

{

	struct dlm_reco_node_data *ndata, *next;

	LIST_HEAD(tmplist);