Commit d4998115 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:
  ocfs2: add IO error check in ocfs2_get_sector()
  ocfs2: set gap to seperate entry and value when xattr in bucket
  ocfs2: lock the metaecc process for xattr bucket
  ocfs2: Use the right access_* method in ctime update of xattr.
  ocfs2/dlm: Make dlm_assert_master_handler() kill itself instead of the asserter
  ocfs2/dlm: Use ast_lock to protect ast_list
  ocfs2: Cleanup the lockname print in dlmglue.c
  ocfs2/dlm: Retract fix for race between purge and migrate
  ocfs2: Access and dirty the buffer_head in mark_written.
parents 392b8e47 28d57d43

fs/ocfs2/alloc.c

+26 −1
Original line number Diff line number Diff line
@@ -4796,6 +4796,29 @@ out: 
	return ret;

}



static int ocfs2_replace_extent_rec(struct inode *inode,

				    handle_t *handle,

				    struct ocfs2_path *path,

				    struct ocfs2_extent_list *el,

				    int split_index,

				    struct ocfs2_extent_rec *split_rec)

{

	int ret;



	ret = ocfs2_path_bh_journal_access(handle, inode, path,

					   path_num_items(path) - 1);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	el->l_recs[split_index] = *split_rec;



	ocfs2_journal_dirty(handle, path_leaf_bh(path));

out:

	return ret;

}



/*

 * Mark part or all of the extent record at split_index in the leaf

 * pointed to by path as written. This removes the unwritten
@@ -4885,7 +4908,9 @@ static int __ocfs2_mark_extent_written(struct inode *inode, 


	if (ctxt.c_contig_type == CONTIG_NONE) {

		if (ctxt.c_split_covers_rec)

			el->l_recs[split_index] = *split_rec;

			ret = ocfs2_replace_extent_rec(inode, handle,

						       path, el,

						       split_index, split_rec);

		else

			ret = ocfs2_split_and_insert(inode, handle, path, et,

						     &last_eb_bh, split_index,

fs/ocfs2/dlm/dlmmaster.c

+6 −6
Original line number Diff line number Diff line
@@ -1849,12 +1849,12 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data, 
		if (!mle) {

			if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN &&

			    res->owner != assert->node_idx) {

				mlog(ML_ERROR, "assert_master from "

					  "%u, but current owner is "

					  "%u! (%.*s)\n",

				       assert->node_idx, res->owner,

				       namelen, name);

				goto kill;

				mlog(ML_ERROR, "DIE! Mastery assert from %u, "

				     "but current owner is %u! (%.*s)\n",

				     assert->node_idx, res->owner, namelen,

				     name);

				__dlm_print_one_lock_resource(res);

				BUG();

			}

		} else if (mle->type != DLM_MLE_MIGRATION) {

			if (res->owner != DLM_LOCK_RES_OWNER_UNKNOWN) {

fs/ocfs2/dlm/dlmthread.c

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,7 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, 


		spin_lock(&res->spinlock);

		/* This ensures that clear refmap is sent after the set */

		__dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG |

						  DLM_LOCK_RES_MIGRATING));

		__dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);

		spin_unlock(&res->spinlock);



		/* clear our bit from the master's refmap, ignore errors */

fs/ocfs2/dlm/dlmunlock.c

+2 −2
Original line number Diff line number Diff line
@@ -117,11 +117,11 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm, 
	else

		BUG_ON(res->owner == dlm->node_num);



	spin_lock(&dlm->spinlock);

	spin_lock(&dlm->ast_lock);

	/* We want to be sure that we're not freeing a lock

	 * that still has AST's pending... */

	in_use = !list_empty(&lock->ast_list);

	spin_unlock(&dlm->spinlock);

	spin_unlock(&dlm->ast_lock);

	if (in_use) {

	       mlog(ML_ERROR, "lockres %.*s: Someone is calling dlmunlock "

		    "while waiting for an ast!", res->lockname.len,

fs/ocfs2/dlmglue.c

+8 −3
Original line number Diff line number Diff line
@@ -321,8 +321,13 @@ static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb, 
static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres,

						int convert);

#define ocfs2_log_dlm_error(_func, _err, _lockres) do {					\

	if ((_lockres)->l_type != OCFS2_LOCK_TYPE_DENTRY)				\

		mlog(ML_ERROR, "DLM error %d while calling %s on resource %s\n",	\

		     _err, _func, _lockres->l_name);					\

	else										\

		mlog(ML_ERROR, "DLM error %d while calling %s on resource %.*s%08x\n",	\

		     _err, _func, OCFS2_DENTRY_LOCK_INO_START - 1, (_lockres)->l_name,	\

		     (unsigned int)ocfs2_get_dentry_lock_ino(_lockres));		\

} while (0)

static int ocfs2_downconvert_thread(void *arg);

static void ocfs2_downconvert_on_unlock(struct ocfs2_super *osb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE