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

Commit 56c225fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm updates from David Teigland:
 "This set includes a couple trivial cleanups and changes recovery log
  messages from DEBUG to INFO"

* tag 'dlm-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: use INFO for recovery messages
  fs: Include appropriate header file in dlm/ast.c
  dlm: silence a harmless use after free warning
parents 53c56662 075f0177

fs/dlm/ast.c

+2 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "dlm_internal.h"

#include "lock.h"

#include "user.h"

#include "ast.h"



static uint64_t dlm_cb_seq;

static DEFINE_SPINLOCK(dlm_cb_seq_spin);
@@ -308,6 +309,6 @@ void dlm_callback_resume(struct dlm_ls *ls) 
	mutex_unlock(&ls->ls_cb_mutex);



	if (count)

		log_debug(ls, "dlm_callback_resume %d", count);

		log_rinfo(ls, "dlm_callback_resume %d", count);

}

fs/dlm/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int dlm_recover_directory(struct dlm_ls *ls) 
	uint16_t namelen;

	unsigned int count = 0, count_match = 0, count_bad = 0, count_add = 0;



	log_debug(ls, "dlm_recover_directory");

	log_rinfo(ls, "dlm_recover_directory");



	if (dlm_no_directory(ls))

		goto out_status;
@@ -189,7 +189,7 @@ int dlm_recover_directory(struct dlm_ls *ls) 
	error = 0;

	dlm_set_recover_status(ls, DLM_RS_DIR);



	log_debug(ls, "dlm_recover_directory %u in %u new",

	log_rinfo(ls, "dlm_recover_directory %u in %u new",

		  count, count_add);

 out_free:

	kfree(last_name);

fs/dlm/dlm_internal.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ struct dlm_mhandle; 
	printk(KERN_ERR "dlm: "fmt"\n" , ##args)

#define log_error(ls, fmt, args...) \

	printk(KERN_ERR "dlm: %s: " fmt "\n", (ls)->ls_name , ##args)

#define log_rinfo(ls, fmt, args...) \

	printk(KERN_INFO "dlm: %s: " fmt "\n", (ls)->ls_name , ##args);



#define log_debug(ls, fmt, args...) \

do { \

fs/dlm/lock.c

+4 −3
Original line number Diff line number Diff line
@@ -687,6 +687,7 @@ static int find_rsb_dir(struct dlm_ls *ls, char *name, int len, 
		log_error(ls, "find_rsb new from_other %d dir %d our %d %s",

			  from_nodeid, dir_nodeid, our_nodeid, r->res_name);

		dlm_free_rsb(r);

		r = NULL;

		error = -ENOTBLK;

		goto out_unlock;

	}
@@ -5462,7 +5463,7 @@ void dlm_recover_purge(struct dlm_ls *ls) 
	up_write(&ls->ls_root_sem);



	if (lkb_count)

		log_debug(ls, "dlm_recover_purge %u locks for %u nodes",

		log_rinfo(ls, "dlm_recover_purge %u locks for %u nodes",

			  lkb_count, nodes_count);

}
@@ -5536,7 +5537,7 @@ void dlm_recover_grant(struct dlm_ls *ls) 
	}



	if (lkb_count)

		log_debug(ls, "dlm_recover_grant %u locks on %u resources",

		log_rinfo(ls, "dlm_recover_grant %u locks on %u resources",

			  lkb_count, rsb_count);

}
@@ -5695,7 +5696,7 @@ int dlm_recover_master_copy(struct dlm_ls *ls, struct dlm_rcom *rc) 
	put_rsb(r);

 out:

	if (error && error != -EEXIST)

		log_debug(ls, "dlm_recover_master_copy remote %d %x error %d",

		log_rinfo(ls, "dlm_recover_master_copy remote %d %x error %d",

			  from_nodeid, remid, error);

	rl->rl_result = cpu_to_le32(error);

	return error;

fs/dlm/lockspace.c

+4 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int do_uevent(struct dlm_ls *ls, int in) 
	else

		kobject_uevent(&ls->ls_kobj, KOBJ_OFFLINE);



	log_debug(ls, "%s the lockspace group...", in ? "joining" : "leaving");

	log_rinfo(ls, "%s the lockspace group...", in ? "joining" : "leaving");



	/* dlm_controld will see the uevent, do the necessary group management

	   and then write to sysfs to wake us */
@@ -198,7 +198,7 @@ static int do_uevent(struct dlm_ls *ls, int in) 
	error = wait_event_interruptible(ls->ls_uevent_wait,

			test_and_clear_bit(LSFL_UEVENT_WAIT, &ls->ls_flags));



	log_debug(ls, "group event done %d %d", error, ls->ls_uevent_result);

	log_rinfo(ls, "group event done %d %d", error, ls->ls_uevent_result);



	if (error)

		goto out;
@@ -640,7 +640,7 @@ static int new_lockspace(const char *name, const char *cluster, 


	dlm_create_debug_file(ls);



	log_debug(ls, "join complete");

	log_rinfo(ls, "join complete");

	*lockspace = ls;

	return 0;
@@ -835,7 +835,7 @@ static int release_lockspace(struct dlm_ls *ls, int force) 
	dlm_clear_members(ls);

	dlm_clear_members_gone(ls);

	kfree(ls->ls_node_array);

	log_debug(ls, "release_lockspace final free");

	log_rinfo(ls, "release_lockspace final free");

	kobject_put(&ls->ls_kobj);

	/* The ls structure will be freed when the kobject is done with */