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

Commit 9343224b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge a bunch of fixes from Andrew Morton:
 "Commit 579f8290 ("swap: add a simple detector for inappropriate
  swapin readahead") is a feature.  No probs if you decide to defer it
  until the next merge window.

  It has been sitting in my tree for over a year because of my dislike
  of all the magic numbers, but recent discussion with Hugh has made me
  give up"

* emailed patches fron Andrew Morton <akpm@linux-foundation.org>:
  mm: __set_page_dirty uses spin_lock_irqsave instead of spin_lock_irq
  arch/x86/mm/numa.c: fix array index overflow when synchronizing nid to memblock.reserved.
  arch/x86/mm/numa.c: initialize numa_kernel_nodes in numa_clear_kernel_node_hotplug()
  mm: __set_page_dirty_nobuffers() uses spin_lock_irqsave() instead of spin_lock_irq()
  mm/swap: fix race on swap_info reuse between swapoff and swapon
  swap: add a simple detector for inappropriate swapin readahead
  ocfs2: free allocated clusters if error occurs after ocfs2_claim_clusters
  Documentation/kernel-parameters.txt: fix memmap= language
parents f2de3a15 227d53b3

Documentation/kernel-parameters.txt

+4 −4
Original line number Diff line number Diff line
@@ -1726,16 +1726,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			option description.



	memmap=nn[KMG]@ss[KMG]

			[KNL] Force usage of a specific region of memory

			Region of memory to be used, from ss to ss+nn.

			[KNL] Force usage of a specific region of memory.

			Region of memory to be used is from ss to ss+nn.



	memmap=nn[KMG]#ss[KMG]

			[KNL,ACPI] Mark specific memory as ACPI data.

			Region of memory to be used, from ss to ss+nn.

			Region of memory to be marked is from ss to ss+nn.



	memmap=nn[KMG]$ss[KMG]

			[KNL,ACPI] Mark specific memory as reserved.

			Region of memory to be used, from ss to ss+nn.

			Region of memory to be reserved is from ss to ss+nn.

			Example: Exclude memory from 0x18690000-0x1869ffff

			         memmap=64K$0x18690000

			         or

arch/x86/mm/numa.c

+12 −9
Original line number Diff line number Diff line
@@ -493,14 +493,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi) 
		struct numa_memblk *mb = &mi->blk[i];

		memblock_set_node(mb->start, mb->end - mb->start,

				  &memblock.memory, mb->nid);



		/*

		 * At this time, all memory regions reserved by memblock are

		 * used by the kernel. Set the nid in memblock.reserved will

		 * mark out all the nodes the kernel resides in.

		 */

		memblock_set_node(mb->start, mb->end - mb->start,

				  &memblock.reserved, mb->nid);

	}



	/*
@@ -565,10 +557,21 @@ static void __init numa_init_array(void) 
static void __init numa_clear_kernel_node_hotplug(void)

{

	int i, nid;

	nodemask_t numa_kernel_nodes;

	nodemask_t numa_kernel_nodes = NODE_MASK_NONE;

	unsigned long start, end;

	struct memblock_type *type = &memblock.reserved;



	/*

	 * At this time, all memory regions reserved by memblock are

	 * used by the kernel. Set the nid in memblock.reserved will

	 * mark out all the nodes the kernel resides in.

	 */

	for (i = 0; i < numa_meminfo.nr_blks; i++) {

		struct numa_memblk *mb = &numa_meminfo.blk[i];

		memblock_set_node(mb->start, mb->end - mb->start,

				  &memblock.reserved, mb->nid);

	}



	/* Mark all kernel nodes. */

	for (i = 0; i < type->cnt; i++)

		node_set(type->regions[i].nid, numa_kernel_nodes);

fs/buffer.c

+4 −2
Original line number Diff line number Diff line
@@ -654,14 +654,16 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode); 
static void __set_page_dirty(struct page *page,

		struct address_space *mapping, int warn)

{

	spin_lock_irq(&mapping->tree_lock);

	unsigned long flags;



	spin_lock_irqsave(&mapping->tree_lock, flags);

	if (page->mapping) {	/* Race with truncate? */

		WARN_ON_ONCE(warn && !PageUptodate(page));

		account_page_dirtied(page, mapping);

		radix_tree_tag_set(&mapping->page_tree,

				page_index(page), PAGECACHE_TAG_DIRTY);

	}

	spin_unlock_irq(&mapping->tree_lock);

	spin_unlock_irqrestore(&mapping->tree_lock, flags);

	__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);

}

fs/ocfs2/alloc.c

+35 −3
Original line number Diff line number Diff line
@@ -4742,6 +4742,7 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
				enum ocfs2_alloc_restarted *reason_ret)

{

	int status = 0, err = 0;

	int need_free = 0;

	int free_extents;

	enum ocfs2_alloc_restarted reason = RESTART_NONE;

	u32 bit_off, num_bits;
@@ -4796,7 +4797,8 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
					      OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto leave;

		need_free = 1;

		goto bail;

	}



	block = ocfs2_clusters_to_blocks(osb->sb, bit_off);
@@ -4807,7 +4809,8 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
				     num_bits, flags, meta_ac);

	if (status < 0) {

		mlog_errno(status);

		goto leave;

		need_free = 1;

		goto bail;

	}



	ocfs2_journal_dirty(handle, et->et_root_bh);
@@ -4821,6 +4824,19 @@ int ocfs2_add_clusters_in_btree(handle_t *handle, 
		reason = RESTART_TRANS;

	}



bail:

	if (need_free) {

		if (data_ac->ac_which == OCFS2_AC_USE_LOCAL)

			ocfs2_free_local_alloc_bits(osb, handle, data_ac,

					bit_off, num_bits);

		else

			ocfs2_free_clusters(handle,

					data_ac->ac_inode,

					data_ac->ac_bh,

					ocfs2_clusters_to_blocks(osb->sb, bit_off),

					num_bits);

	}



leave:

	if (reason_ret)

		*reason_ret = reason;
@@ -6805,6 +6821,8 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
					 struct buffer_head *di_bh)

{

	int ret, i, has_data, num_pages = 0;

	int need_free = 0;

	u32 bit_off, num;

	handle_t *handle;

	u64 uninitialized_var(block);

	struct ocfs2_inode_info *oi = OCFS2_I(inode);
@@ -6850,7 +6868,6 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
	}



	if (has_data) {

		u32 bit_off, num;

		unsigned int page_end;

		u64 phys;
@@ -6886,6 +6903,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		ret = ocfs2_grab_eof_pages(inode, 0, end, pages, &num_pages);

		if (ret) {

			mlog_errno(ret);

			need_free = 1;

			goto out_commit;

		}
@@ -6896,6 +6914,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		ret = ocfs2_read_inline_data(inode, pages[0], di_bh);

		if (ret) {

			mlog_errno(ret);

			need_free = 1;

			goto out_commit;

		}
@@ -6927,6 +6946,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
		ret = ocfs2_insert_extent(handle, &et, 0, block, 1, 0, NULL);

		if (ret) {

			mlog_errno(ret);

			need_free = 1;

			goto out_commit;

		}
@@ -6938,6 +6958,18 @@ out_commit: 
		dquot_free_space_nodirty(inode,

					  ocfs2_clusters_to_bytes(osb->sb, 1));



	if (need_free) {

		if (data_ac->ac_which == OCFS2_AC_USE_LOCAL)

			ocfs2_free_local_alloc_bits(osb, handle, data_ac,

					bit_off, num);

		else

			ocfs2_free_clusters(handle,

					data_ac->ac_inode,

					data_ac->ac_bh,

					ocfs2_clusters_to_blocks(osb->sb, bit_off),

					num);

	}



	ocfs2_commit_trans(osb, handle);



out_unlock:

fs/ocfs2/localalloc.c

+42 −0
Original line number Diff line number Diff line
@@ -781,6 +781,48 @@ bail: 
	return status;

}



int ocfs2_free_local_alloc_bits(struct ocfs2_super *osb,

				handle_t *handle,

				struct ocfs2_alloc_context *ac,

				u32 bit_off,

				u32 num_bits)

{

	int status, start;

	u32 clear_bits;

	struct inode *local_alloc_inode;

	void *bitmap;

	struct ocfs2_dinode *alloc;

	struct ocfs2_local_alloc *la;



	BUG_ON(ac->ac_which != OCFS2_AC_USE_LOCAL);



	local_alloc_inode = ac->ac_inode;

	alloc = (struct ocfs2_dinode *) osb->local_alloc_bh->b_data;

	la = OCFS2_LOCAL_ALLOC(alloc);



	bitmap = la->la_bitmap;

	start = bit_off - le32_to_cpu(la->la_bm_off);

	clear_bits = num_bits;



	status = ocfs2_journal_access_di(handle,

			INODE_CACHE(local_alloc_inode),

			osb->local_alloc_bh,

			OCFS2_JOURNAL_ACCESS_WRITE);

	if (status < 0) {

		mlog_errno(status);

		goto bail;

	}



	while (clear_bits--)

		ocfs2_clear_bit(start++, bitmap);



	le32_add_cpu(&alloc->id1.bitmap1.i_used, -num_bits);

	ocfs2_journal_dirty(handle, osb->local_alloc_bh);



bail:

	return status;

}



static u32 ocfs2_local_alloc_count_bits(struct ocfs2_dinode *alloc)

{

	u32 count;