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

Commit df53cd3b authored by Dong Fang's avatar Dong Fang Committed by Linus Torvalds
Browse files

ocfs2: use list_for_each_entry() instead of list_for_each() 



[dan.carpenter@oracle.com: fix up some NULL dereference bugs]
Signed-off-by: default avatarDong Fang <yp.fangdong@gmail.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jeff Liu <jeff.liu@oracle.com>
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8dd7903e

fs/ocfs2/cluster/heartbeat.c

+5 −9
Original line number Diff line number Diff line
@@ -628,11 +628,9 @@ static void o2hb_fire_callbacks(struct o2hb_callback *hbcall, 
				struct o2nm_node *node,

				int idx)

{

	struct list_head *iter;

	struct o2hb_callback_func *f;



	list_for_each(iter, &hbcall->list) {

		f = list_entry(iter, struct o2hb_callback_func, hc_item);

	list_for_each_entry(f, &hbcall->list, hc_item) {

		mlog(ML_HEARTBEAT, "calling funcs %p\n", f);

		(f->hc_func)(node, idx, f->hc_data);

	}
@@ -2516,8 +2514,7 @@ unlock: 
int o2hb_register_callback(const char *region_uuid,

			   struct o2hb_callback_func *hc)

{

	struct o2hb_callback_func *tmp;

	struct list_head *iter;

	struct o2hb_callback_func *f;

	struct o2hb_callback *hbcall;

	int ret;
@@ -2540,10 +2537,9 @@ int o2hb_register_callback(const char *region_uuid, 


	down_write(&o2hb_callback_sem);



	list_for_each(iter, &hbcall->list) {

		tmp = list_entry(iter, struct o2hb_callback_func, hc_item);

		if (hc->hc_priority < tmp->hc_priority) {

			list_add_tail(&hc->hc_item, iter);

	list_for_each_entry(f, &hbcall->list, hc_item) {

		if (hc->hc_priority < f->hc_priority) {

			list_add_tail(&hc->hc_item, &f->hc_item);

			break;

		}

	}

fs/ocfs2/dlm/dlmast.c

+3 −5
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, 
	struct dlm_lock *lock = NULL;

	struct dlm_proxy_ast *past = (struct dlm_proxy_ast *) msg->buf;

	char *name;

	struct list_head *iter, *head=NULL;

	struct list_head *head = NULL;

	__be64 cookie;

	u32 flags;

	u8 node;
@@ -373,8 +373,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, 
	/* try convert queue for both ast/bast */

	head = &res->converting;

	lock = NULL;

	list_for_each(iter, head) {

		lock = list_entry (iter, struct dlm_lock, list);

	list_for_each_entry(lock, head, list) {

		if (lock->ml.cookie == cookie)

			goto do_ast;

	}
@@ -385,8 +384,7 @@ int dlm_proxy_ast_handler(struct o2net_msg *msg, u32 len, void *data, 
	else

		head = &res->granted;



	list_for_each(iter, head) {

		lock = list_entry (iter, struct dlm_lock, list);

	list_for_each_entry(lock, head, list) {

		if (lock->ml.cookie == cookie)

			goto do_ast;

	}

fs/ocfs2/dlm/dlmcommon.h

+1 −3
Original line number Diff line number Diff line
@@ -1079,11 +1079,9 @@ static inline int dlm_lock_compatible(int existing, int request) 
static inline int dlm_lock_on_list(struct list_head *head,

				   struct dlm_lock *lock)

{

	struct list_head *iter;

	struct dlm_lock *tmplock;



	list_for_each(iter, head) {

		tmplock = list_entry(iter, struct dlm_lock, list);

	list_for_each_entry(tmplock, head, list) {

		if (tmplock == lock)

			return 1;

	}

fs/ocfs2/dlm/dlmconvert.c

+7 −11
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm, 
					   int *kick_thread)

{

	enum dlm_status status = DLM_NORMAL;

	struct list_head *iter;

	struct dlm_lock *tmplock=NULL;



	assert_spin_locked(&res->spinlock);
@@ -185,16 +184,14 @@ static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm, 


	/* upconvert from here on */

	status = DLM_NORMAL;

	list_for_each(iter, &res->granted) {

		tmplock = list_entry(iter, struct dlm_lock, list);

	list_for_each_entry(tmplock, &res->granted, list) {

		if (tmplock == lock)

			continue;

		if (!dlm_lock_compatible(tmplock->ml.type, type))

			goto switch_queues;

	}



	list_for_each(iter, &res->converting) {

		tmplock = list_entry(iter, struct dlm_lock, list);

	list_for_each_entry(tmplock, &res->converting, list) {

		if (!dlm_lock_compatible(tmplock->ml.type, type))

			goto switch_queues;

		/* existing conversion requests take precedence */
@@ -424,8 +421,8 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
	struct dlm_ctxt *dlm = data;

	struct dlm_convert_lock *cnv = (struct dlm_convert_lock *)msg->buf;

	struct dlm_lock_resource *res = NULL;

	struct list_head *iter;

	struct dlm_lock *lock = NULL;

	struct dlm_lock *tmp_lock;

	struct dlm_lockstatus *lksb;

	enum dlm_status status = DLM_NORMAL;

	u32 flags;
@@ -471,14 +468,13 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data, 
		dlm_error(status);

		goto leave;

	}

	list_for_each(iter, &res->granted) {

		lock = list_entry(iter, struct dlm_lock, list);

		if (lock->ml.cookie == cnv->cookie &&

		    lock->ml.node == cnv->node_idx) {

	list_for_each_entry(tmp_lock, &res->granted, list) {

		if (tmp_lock->ml.cookie == cnv->cookie &&

		    tmp_lock->ml.node == cnv->node_idx) {

			lock = tmp_lock;

			dlm_lock_get(lock);

			break;

		}

		lock = NULL;

	}

	spin_unlock(&res->spinlock);

	if (!lock) {

fs/ocfs2/dlm/dlmdebug.c

+4 −11
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ static void __dlm_print_lock(struct dlm_lock *lock) 


void __dlm_print_one_lock_resource(struct dlm_lock_resource *res)

{

	struct list_head *iter2;

	struct dlm_lock *lock;

	char buf[DLM_LOCKID_NAME_MAX];
@@ -118,18 +117,15 @@ void __dlm_print_one_lock_resource(struct dlm_lock_resource *res) 
	       res->inflight_locks, atomic_read(&res->asts_reserved));

	dlm_print_lockres_refmap(res);

	printk("  granted queue:\n");

	list_for_each(iter2, &res->granted) {

		lock = list_entry(iter2, struct dlm_lock, list);

	list_for_each_entry(lock, &res->granted, list) {

		__dlm_print_lock(lock);

	}

	printk("  converting queue:\n");

	list_for_each(iter2, &res->converting) {

		lock = list_entry(iter2, struct dlm_lock, list);

	list_for_each_entry(lock, &res->converting, list) {

		__dlm_print_lock(lock);

	}

	printk("  blocked queue:\n");

	list_for_each(iter2, &res->blocked) {

		lock = list_entry(iter2, struct dlm_lock, list);

	list_for_each_entry(lock, &res->blocked, list) {

		__dlm_print_lock(lock);

	}

}
@@ -446,7 +442,6 @@ static int debug_mle_print(struct dlm_ctxt *dlm, char *buf, int len) 
{

	struct dlm_master_list_entry *mle;

	struct hlist_head *bucket;

	struct hlist_node *list;

	int i, out = 0;

	unsigned long total = 0, longest = 0, bucket_count = 0;
@@ -456,9 +451,7 @@ static int debug_mle_print(struct dlm_ctxt *dlm, char *buf, int len) 
	spin_lock(&dlm->master_lock);

	for (i = 0; i < DLM_HASH_BUCKETS; i++) {

		bucket = dlm_master_hash(dlm, i);

		hlist_for_each(list, bucket) {

			mle = hlist_entry(list, struct dlm_master_list_entry,

					  master_hash_node);

		hlist_for_each_entry(mle, bucket, master_hash_node) {

			++total;

			++bucket_count;

			if (len - out < 200)