Commit 498f7f50 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
  MAINTAINERS: Update Joel Becker's email address
  ocfs2: Remove unused truncate function from alloc.c
  ocfs2/cluster: dereferencing before checking in nst_seq_show()
  ocfs2: fix build for OCFS2_FS_STATS not enabled
  ocfs2/cluster: Show o2net timing statistics
  ocfs2/cluster: Track process message timing stats for each socket
  ocfs2/cluster: Track send message timing stats for each socket
  ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
  ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
  ocfs2: Add DEBUG_FS dependency
  ocfs2/dlm: Hard code the values for enums
  ocfs2/dlm: Minor cleanup
  ocfs2/dlm: Cleanup dlmdebug.c
  ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
  ocfs2/cluster: Pin the local node when o2hb thread starts
  ocfs2/cluster: Show pin state for each o2hb region
  ocfs2/cluster: Pin/unpin o2hb regions
  ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
  ocfs2/cluster: Pin the remote node item in configfs
  ocfs2/dlm: make existing convertion precedent over new lock
  ...
parents 0969d11e d6351db2

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -1785,7 +1785,8 @@ S: Maintained 
F:	drivers/usb/atm/cxacru.c



CONFIGFS

M:	Joel Becker <joel.becker@oracle.com>

M:	Joel Becker <jlbec@evilplan.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git

S:	Supported

F:	fs/configfs/

F:	include/linux/configfs.h
@@ -4549,7 +4550,7 @@ F: include/linux/oprofile.h 


ORACLE CLUSTER FILESYSTEM 2 (OCFS2)

M:	Mark Fasheh <mfasheh@suse.com>

M:	Joel Becker <joel.becker@oracle.com>

M:	Joel Becker <jlbec@evilplan.org>

L:	ocfs2-devel@oss.oracle.com (moderated for non-subscribers)

W:	http://oss.oracle.com/projects/ocfs2/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git

fs/ocfs2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ config OCFS2_FS_USERSPACE_CLUSTER 


config OCFS2_FS_STATS

	bool "OCFS2 statistics"

	depends on OCFS2_FS

	depends on OCFS2_FS && DEBUG_FS

	default y

	help

	  This option allows some fs statistics to be captured. Enabling

fs/ocfs2/alloc.c

+3 −74
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ static inline int ocfs2_et_sanity_check(struct ocfs2_extent_tree *et) 
	return ret;

}



static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc);

static int ocfs2_cache_extent_block_free(struct ocfs2_cached_dealloc_ctxt *ctxt,

					 struct ocfs2_extent_block *eb);

static void ocfs2_adjust_rightmost_records(handle_t *handle,
@@ -5858,6 +5857,7 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 


	ocfs2_journal_dirty(handle, tl_bh);



	osb->truncated_clusters += num_clusters;

bail:

	mlog_exit(status);

	return status;
@@ -5929,6 +5929,8 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
		i--;

	}



	osb->truncated_clusters = 0;



bail:

	mlog_exit(status);

	return status;
@@ -7138,64 +7140,6 @@ bail: 
	return status;

}



/*

 * Expects the inode to already be locked.

 */

int ocfs2_prepare_truncate(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct buffer_head *fe_bh,

			   struct ocfs2_truncate_context **tc)

{

	int status;

	unsigned int new_i_clusters;

	struct ocfs2_dinode *fe;

	struct ocfs2_extent_block *eb;

	struct buffer_head *last_eb_bh = NULL;



	mlog_entry_void();



	*tc = NULL;



	new_i_clusters = ocfs2_clusters_for_bytes(osb->sb,

						  i_size_read(inode));

	fe = (struct ocfs2_dinode *) fe_bh->b_data;



	mlog(0, "fe->i_clusters = %u, new_i_clusters = %u, fe->i_size ="

	     "%llu\n", le32_to_cpu(fe->i_clusters), new_i_clusters,

	     (unsigned long long)le64_to_cpu(fe->i_size));



	*tc = kzalloc(sizeof(struct ocfs2_truncate_context), GFP_KERNEL);

	if (!(*tc)) {

		status = -ENOMEM;

		mlog_errno(status);

		goto bail;

	}

	ocfs2_init_dealloc_ctxt(&(*tc)->tc_dealloc);



	if (fe->id2.i_list.l_tree_depth) {

		status = ocfs2_read_extent_block(INODE_CACHE(inode),

						 le64_to_cpu(fe->i_last_eb_blk),

						 &last_eb_bh);

		if (status < 0) {

			mlog_errno(status);

			goto bail;

		}

		eb = (struct ocfs2_extent_block *) last_eb_bh->b_data;

	}



	(*tc)->tc_last_eb_bh = last_eb_bh;



	status = 0;

bail:

	if (status < 0) {

		if (*tc)

			ocfs2_free_truncate_context(*tc);

		*tc = NULL;

	}

	mlog_exit_void();

	return status;

}



/*

 * 'start' is inclusive, 'end' is not.

 */
@@ -7270,18 +7214,3 @@ out_commit: 
out:

	return ret;

}
 


static void ocfs2_free_truncate_context(struct ocfs2_truncate_context *tc)

{

	/*

	 * The caller is responsible for completing deallocation

	 * before freeing the context.

	 */

	if (tc->tc_dealloc.c_first_suballocator != NULL)

		mlog(ML_NOTICE,

		     "Truncate completion has non-empty dealloc context\n");



	brelse(tc->tc_last_eb_bh);



	kfree(tc);

}

fs/ocfs2/alloc.h

+0 −4
Original line number Diff line number Diff line
@@ -228,10 +228,6 @@ struct ocfs2_truncate_context { 


int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,

				  u64 range_start, u64 range_end);

int ocfs2_prepare_truncate(struct ocfs2_super *osb,

			   struct inode *inode,

			   struct buffer_head *fe_bh,

			   struct ocfs2_truncate_context **tc);

int ocfs2_commit_truncate(struct ocfs2_super *osb,

			  struct inode *inode,

			  struct buffer_head *di_bh);

fs/ocfs2/aops.c

+58 −1
Original line number Diff line number Diff line
@@ -1630,6 +1630,43 @@ static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh, 
	return ret;

}



/*

 * Try to flush truncate logs if we can free enough clusters from it.

 * As for return value, "< 0" means error, "0" no space and "1" means

 * we have freed enough spaces and let the caller try to allocate again.

 */

static int ocfs2_try_to_free_truncate_log(struct ocfs2_super *osb,

					  unsigned int needed)

{

	tid_t target;

	int ret = 0;

	unsigned int truncated_clusters;



	mutex_lock(&osb->osb_tl_inode->i_mutex);

	truncated_clusters = osb->truncated_clusters;

	mutex_unlock(&osb->osb_tl_inode->i_mutex);



	/*

	 * Check whether we can succeed in allocating if we free

	 * the truncate log.

	 */

	if (truncated_clusters < needed)

		goto out;



	ret = ocfs2_flush_truncate_log(osb);

	if (ret) {

		mlog_errno(ret);

		goto out;

	}



	if (jbd2_journal_start_commit(osb->journal->j_journal, &target)) {

		jbd2_log_wait_commit(osb->journal->j_journal, target);

		ret = 1;

	}

out:

	return ret;

}



int ocfs2_write_begin_nolock(struct file *filp,

			     struct address_space *mapping,

			     loff_t pos, unsigned len, unsigned flags,
@@ -1637,7 +1674,7 @@ int ocfs2_write_begin_nolock(struct file *filp, 
			     struct buffer_head *di_bh, struct page *mmap_page)

{

	int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS;

	unsigned int clusters_to_alloc, extents_to_split;

	unsigned int clusters_to_alloc, extents_to_split, clusters_need = 0;

	struct ocfs2_write_ctxt *wc;

	struct inode *inode = mapping->host;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
@@ -1646,7 +1683,9 @@ int ocfs2_write_begin_nolock(struct file *filp, 
	struct ocfs2_alloc_context *meta_ac = NULL;

	handle_t *handle;

	struct ocfs2_extent_tree et;

	int try_free = 1, ret1;



try_again:

	ret = ocfs2_alloc_write_ctxt(&wc, osb, pos, len, di_bh);

	if (ret) {

		mlog_errno(ret);
@@ -1681,6 +1720,7 @@ int ocfs2_write_begin_nolock(struct file *filp, 
		mlog_errno(ret);

		goto out;

	} else if (ret == 1) {

		clusters_need = wc->w_clen;

		ret = ocfs2_refcount_cow(inode, filp, di_bh,

					 wc->w_cpos, wc->w_clen, UINT_MAX);

		if (ret) {
@@ -1695,6 +1735,7 @@ int ocfs2_write_begin_nolock(struct file *filp, 
		mlog_errno(ret);

		goto out;

	}

	clusters_need += clusters_to_alloc;



	di = (struct ocfs2_dinode *)wc->w_di_bh->b_data;
@@ -1817,6 +1858,22 @@ out: 
		ocfs2_free_alloc_context(data_ac);

	if (meta_ac)

		ocfs2_free_alloc_context(meta_ac);



	if (ret == -ENOSPC && try_free) {

		/*

		 * Try to free some truncate log so that we can have enough

		 * clusters to allocate.

		 */

		try_free = 0;



		ret1 = ocfs2_try_to_free_truncate_log(osb, clusters_need);

		if (ret1 == 1)

			goto try_again;



		if (ret1 < 0)

			mlog_errno(ret1);

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE