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

Commit eb99adde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
  [PATCH] fs/ocfs2/dlm/: cleanups
  ocfs2: fix compiler warnings in dlm_convert_lock_handler()
  ocfs2: dlm_print_one_mle() needs to be defined
  ocfs2: remove whitespace in dlmunlock.c
  ocfs2: move dlm work to a private work queue
  ocfs2: fix incorrect error returns
  ocfs2: tune down some noisy messages during dlm recovery
  ocfs2: display message before waiting for recovery to complete
  ocfs2: mlog in dlm_convert_lock_handler() should be ML_ERROR
  ocfs2: retry operations when a lock is marked in recovery
  ocfs2: use cond_resched() in dlm_thread()
  ocfs2: use GFP_NOFS in some dlm operations
  ocfs2: wait for recovery when starting lock mastery
  ocfs2: continue recovery when a dead node is encountered
  ocfs2: remove unneccesary spin_unlock() in dlm_remaster_locks()
  ocfs2: dlm_remaster_locks() should never exit without completing
  ocfs2: special case recovery lock in dlmlock_remote()
  ocfs2: pending mastery asserts and migrations should block each other
  ocfs2: temporarily disable automatic lock migration
  ocfs2: do not unconditionally purge the lockres in dlmlock_remote()
  ...
parents f6e6e883 3fb5a989

fs/ocfs2/dlm/dlmast.c

+7 −5
Original line number Diff line number Diff line
@@ -197,12 +197,14 @@ static void dlm_update_lvb(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, 
				  lock->ml.node == dlm->node_num ? "master" :

				  "remote");

			memcpy(lksb->lvb, res->lvb, DLM_LVB_LEN);

		} else if (lksb->flags & DLM_LKSB_PUT_LVB) {

			mlog(0, "setting lvb from lockres for %s node\n",

				  lock->ml.node == dlm->node_num ? "master" :

				  "remote");

			memcpy(res->lvb, lksb->lvb, DLM_LVB_LEN);

		}

		/* Do nothing for lvb put requests - they should be done in

 		 * place when the lock is downconverted - otherwise we risk

 		 * racing gets and puts which could result in old lvb data

 		 * being propagated. We leave the put flag set and clear it

 		 * here. In the future we might want to clear it at the time

 		 * the put is actually done.

		 */

		spin_unlock(&res->spinlock);

	}

fs/ocfs2/dlm/dlmcommon.h

+53 −10
Original line number Diff line number Diff line
@@ -37,7 +37,17 @@ 
#define DLM_THREAD_SHUFFLE_INTERVAL    5     // flush everything every 5 passes

#define DLM_THREAD_MS                  200   // flush at least every 200 ms



#define DLM_HASH_BUCKETS     (PAGE_SIZE / sizeof(struct hlist_head))

#define DLM_HASH_SIZE_DEFAULT	(1 << 14)

#if DLM_HASH_SIZE_DEFAULT < PAGE_SIZE

# define DLM_HASH_PAGES		1

#else

# define DLM_HASH_PAGES		(DLM_HASH_SIZE_DEFAULT / PAGE_SIZE)

#endif

#define DLM_BUCKETS_PER_PAGE	(PAGE_SIZE / sizeof(struct hlist_head))

#define DLM_HASH_BUCKETS	(DLM_HASH_PAGES * DLM_BUCKETS_PER_PAGE)



/* Intended to make it easier for us to switch out hash functions */

#define dlm_lockid_hash(_n, _l) full_name_hash(_n, _l)



enum dlm_ast_type {

	DLM_AST = 0,
@@ -62,6 +72,7 @@ static inline int dlm_is_recovery_lock(const char *lock_name, int name_len) 
}



#define DLM_RECO_STATE_ACTIVE    0x0001

#define DLM_RECO_STATE_FINALIZE  0x0002



struct dlm_recovery_ctxt

{
@@ -85,7 +96,7 @@ enum dlm_ctxt_state { 
struct dlm_ctxt

{

	struct list_head list;

	struct hlist_head *lockres_hash;

	struct hlist_head **lockres_hash;

	struct list_head dirty_list;

	struct list_head purge_list;

	struct list_head pending_asts;
@@ -120,6 +131,7 @@ struct dlm_ctxt 
	struct o2hb_callback_func dlm_hb_down;

	struct task_struct *dlm_thread_task;

	struct task_struct *dlm_reco_thread_task;

	struct workqueue_struct *dlm_worker;

	wait_queue_head_t dlm_thread_wq;

	wait_queue_head_t dlm_reco_thread_wq;

	wait_queue_head_t ast_wq;
@@ -132,6 +144,11 @@ struct dlm_ctxt 
	struct list_head	dlm_eviction_callbacks;

};



static inline struct hlist_head *dlm_lockres_hash(struct dlm_ctxt *dlm, unsigned i)

{

	return dlm->lockres_hash[(i / DLM_BUCKETS_PER_PAGE) % DLM_HASH_PAGES] + (i % DLM_BUCKETS_PER_PAGE);

}



/* these keventd work queue items are for less-frequently

 * called functions that cannot be directly called from the

 * net message handlers for some reason, usually because
@@ -216,20 +233,29 @@ struct dlm_lock_resource 
	/* WARNING: Please see the comment in dlm_init_lockres before

	 * adding fields here. */

	struct hlist_node hash_node;

	struct qstr lockname;

	struct kref      refs;



	/* please keep these next 3 in this order

	 * some funcs want to iterate over all lists */

	/*

	 * Please keep granted, converting, and blocked in this order,

	 * as some funcs want to iterate over all lists.

	 *

	 * All four lists are protected by the hash's reference.

	 */

	struct list_head granted;

	struct list_head converting;

	struct list_head blocked;

	struct list_head purge;



	/*

	 * These two lists require you to hold an additional reference

	 * while they are on the list.

	 */

	struct list_head dirty;

	struct list_head recovering; // dlm_recovery_ctxt.resources list



	/* unused lock resources have their last_used stamped and are

	 * put on a list for the dlm thread to run. */

	struct list_head purge;

	unsigned long    last_used;



	unsigned migration_pending:1;
@@ -238,7 +264,6 @@ struct dlm_lock_resource 
	wait_queue_head_t wq;

	u8  owner;              //node which owns the lock resource, or unknown

	u16 state;

	struct qstr lockname;

	char lvb[DLM_LVB_LEN];

};
@@ -300,6 +325,15 @@ enum dlm_lockres_list { 
	DLM_BLOCKED_LIST

};



static inline int dlm_lvb_is_empty(char *lvb)

{

	int i;

	for (i=0; i<DLM_LVB_LEN; i++)

		if (lvb[i])

			return 0;

	return 1;

}



static inline struct list_head *

dlm_list_idx_to_ptr(struct dlm_lock_resource *res, enum dlm_lockres_list idx)

{
@@ -609,7 +643,8 @@ struct dlm_finalize_reco 
{

	u8 node_idx;

	u8 dead_node;

	__be16 pad1;

	u8 flags;

	u8 pad1;

	__be32 pad2;

};
@@ -676,6 +711,7 @@ void dlm_wait_for_recovery(struct dlm_ctxt *dlm); 
void dlm_kick_recovery_thread(struct dlm_ctxt *dlm);

int dlm_is_node_dead(struct dlm_ctxt *dlm, u8 node);

int dlm_wait_for_node_death(struct dlm_ctxt *dlm, u8 node, int timeout);

int dlm_wait_for_node_recovery(struct dlm_ctxt *dlm, u8 node, int timeout);



void dlm_put(struct dlm_ctxt *dlm);

struct dlm_ctxt *dlm_grab(struct dlm_ctxt *dlm);
@@ -687,14 +723,20 @@ void dlm_lockres_calc_usage(struct dlm_ctxt *dlm, 
			    struct dlm_lock_resource *res);

void dlm_purge_lockres(struct dlm_ctxt *dlm,

		       struct dlm_lock_resource *lockres);

void dlm_lockres_get(struct dlm_lock_resource *res);

static inline void dlm_lockres_get(struct dlm_lock_resource *res)

{

	/* This is called on every lookup, so it might be worth

	 * inlining. */

	kref_get(&res->refs);

}

void dlm_lockres_put(struct dlm_lock_resource *res);

void __dlm_unhash_lockres(struct dlm_lock_resource *res);

void __dlm_insert_lockres(struct dlm_ctxt *dlm,

			  struct dlm_lock_resource *res);

struct dlm_lock_resource * __dlm_lookup_lockres(struct dlm_ctxt *dlm,

						const char *name,

						unsigned int len);

						unsigned int len,

						unsigned int hash);

struct dlm_lock_resource * dlm_lookup_lockres(struct dlm_ctxt *dlm,

					      const char *name,

					      unsigned int len);
@@ -819,6 +861,7 @@ void dlm_clean_master_list(struct dlm_ctxt *dlm, 
			   u8 dead_node);

int dlm_lock_basts_flushed(struct dlm_ctxt *dlm, struct dlm_lock *lock);



int __dlm_lockres_unused(struct dlm_lock_resource *res);



static inline const char * dlm_lock_mode_name(int mode)

{

fs/ocfs2/dlm/dlmconvert.c

+24 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ static enum dlm_status __dlmconvert_master(struct dlm_ctxt *dlm, 
	if (lock->ml.node == dlm->node_num)

		mlog(0, "doing in-place convert for nonlocal lock\n");

	lock->ml.type = type;

	if (lock->lksb->flags & DLM_LKSB_PUT_LVB)

		memcpy(res->lvb, lock->lksb->lvb, DLM_LVB_LEN);



	status = DLM_NORMAL;

	*call_ast = 1;

	goto unlock_exit;
@@ -461,6 +464,12 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) 
	}



	spin_lock(&res->spinlock);

	status = __dlm_lockres_state_to_status(res);

	if (status != DLM_NORMAL) {

		spin_unlock(&res->spinlock);

		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 &&
@@ -470,6 +479,21 @@ int dlm_convert_lock_handler(struct o2net_msg *msg, u32 len, void *data) 
		}

		lock = NULL;

	}

	if (!lock) {

		__dlm_print_one_lock_resource(res);

		list_for_each(iter, &res->granted) {

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

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

				mlog(ML_ERROR, "There is something here "

				     "for node %u, lock->ml.cookie=%llu, "

				     "cnv->cookie=%llu\n", cnv->node_idx,

				     (unsigned long long)lock->ml.cookie,

				     (unsigned long long)cnv->cookie);

				break;

			}

		}

		lock = NULL;

	}

	spin_unlock(&res->spinlock);

	if (!lock) {

		status = DLM_IVLOCKID;

fs/ocfs2/dlm/dlmdebug.c

+3 −3
Original line number Diff line number Diff line
@@ -37,10 +37,8 @@ 


#include "dlmapi.h"

#include "dlmcommon.h"

#include "dlmdebug.h"



#include "dlmdomain.h"

#include "dlmdebug.h"



#define MLOG_MASK_PREFIX ML_DLM

#include "cluster/masklog.h"
@@ -120,6 +118,7 @@ void dlm_print_one_lock(struct dlm_lock *lockid) 
}

EXPORT_SYMBOL_GPL(dlm_print_one_lock);



#if 0

void dlm_dump_lock_resources(struct dlm_ctxt *dlm)

{

	struct dlm_lock_resource *res;
@@ -136,12 +135,13 @@ void dlm_dump_lock_resources(struct dlm_ctxt *dlm) 


	spin_lock(&dlm->spinlock);

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

		bucket = &(dlm->lockres_hash[i]);

		bucket = dlm_lockres_hash(dlm, i);

		hlist_for_each_entry(res, iter, bucket, hash_node)

			dlm_print_one_lock_resource(res);

	}

	spin_unlock(&dlm->spinlock);

}

#endif  /*  0  */



static const char *dlm_errnames[] = {

	[DLM_NORMAL] =			"DLM_NORMAL",

fs/ocfs2/dlm/dlmdebug.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/* -*- mode: c; c-basic-offset: 8; -*-

 * vim: noexpandtab sw=8 ts=8 sts=0:

 *

 * dlmdebug.h

 *

 * Copyright (C) 2004 Oracle.  All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public

 * License along with this program; if not, write to the

 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,

 * Boston, MA 021110-1307, USA.

 *

 */



#ifndef DLMDEBUG_H

#define DLMDEBUG_H



void dlm_dump_lock_resources(struct dlm_ctxt *dlm);



#endif