Commit 73fcb1a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  hfsplus: stop workqueue when fill_super() failed
  mm: don't allow deferred pages with NEED_PER_CPU_KM
  MAINTAINERS: add Q: entry to kselftest for patchwork project
  radix tree: fix multi-order iteration race
  radix tree test suite: multi-order iteration race
  radix tree test suite: add item_delete_rcu()
  radix tree test suite: fix compilation issue
  radix tree test suite: fix mapshift build target
  include/linux/mm.h: add new inline function vmf_error()
  lib/test_bitmap.c: fix bitmap optimisation tests to report errors correctly
parents 10a2f874 66072c29

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7698,6 +7698,7 @@ KERNEL SELFTEST FRAMEWORK 
M:	Shuah Khan <shuah@kernel.org>

L:	linux-kselftest@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git

Q:	https://patchwork.kernel.org/project/linux-kselftest/list/

S:	Maintained

F:	tools/testing/selftests/

F:	Documentation/dev-tools/kselftest*

fs/hfsplus/super.c

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent) 
	return 0;



out_put_hidden_dir:

	cancel_delayed_work_sync(&sbi->sync_work);

	iput(sbi->hidden_dir);

out_put_root:

	dput(sb->s_root);

include/linux/mm.h

+7 −0
Original line number Diff line number Diff line
@@ -2466,6 +2466,13 @@ static inline vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma, 
	return VM_FAULT_NOPAGE;

}



static inline vm_fault_t vmf_error(int err)

{

	if (err == -ENOMEM)

		return VM_FAULT_OOM;

	return VM_FAULT_SIGBUS;

}



struct page *follow_page_mask(struct vm_area_struct *vma,

			      unsigned long address, unsigned int foll_flags,

			      unsigned int *page_mask);

lib/radix-tree.c

+2 −4
Original line number Diff line number Diff line
@@ -1612,11 +1612,9 @@ static void set_iter_tags(struct radix_tree_iter *iter, 
static void __rcu **skip_siblings(struct radix_tree_node **nodep,

			void __rcu **slot, struct radix_tree_iter *iter)

{

	void *sib = node_to_entry(slot - 1);



	while (iter->index < iter->next_index) {

		*nodep = rcu_dereference_raw(*slot);

		if (*nodep && *nodep != sib)

		if (*nodep && !is_sibling_entry(iter->node, *nodep))

			return slot;

		slot++;

		iter->index = __radix_tree_iter_add(iter, 1);
@@ -1631,7 +1629,7 @@ void __rcu **__radix_tree_next_slot(void __rcu **slot, 
				struct radix_tree_iter *iter, unsigned flags)

{

	unsigned tag = flags & RADIX_TREE_ITER_TAG_MASK;

	struct radix_tree_node *node = rcu_dereference_raw(*slot);

	struct radix_tree_node *node;



	slot = skip_siblings(&node, slot, iter);

lib/test_bitmap.c

+15 −6
Original line number Diff line number Diff line
@@ -331,23 +331,32 @@ static void noinline __init test_mem_optimisations(void) 
	unsigned int start, nbits;



	for (start = 0; start < 1024; start += 8) {

		for (nbits = 0; nbits < 1024 - start; nbits += 8) {

			memset(bmap1, 0x5a, sizeof(bmap1));

			memset(bmap2, 0x5a, sizeof(bmap2));

		for (nbits = 0; nbits < 1024 - start; nbits += 8) {



			bitmap_set(bmap1, start, nbits);

			__bitmap_set(bmap2, start, nbits);

			if (!bitmap_equal(bmap1, bmap2, 1024))

			if (!bitmap_equal(bmap1, bmap2, 1024)) {

				printk("set not equal %d %d\n", start, nbits);

			if (!__bitmap_equal(bmap1, bmap2, 1024))

				failed_tests++;

			}

			if (!__bitmap_equal(bmap1, bmap2, 1024)) {

				printk("set not __equal %d %d\n", start, nbits);

				failed_tests++;

			}



			bitmap_clear(bmap1, start, nbits);

			__bitmap_clear(bmap2, start, nbits);

			if (!bitmap_equal(bmap1, bmap2, 1024))

			if (!bitmap_equal(bmap1, bmap2, 1024)) {

				printk("clear not equal %d %d\n", start, nbits);

			if (!__bitmap_equal(bmap1, bmap2, 1024))

				failed_tests++;

			}

			if (!__bitmap_equal(bmap1, bmap2, 1024)) {

				printk("clear not __equal %d %d\n", start,

									nbits);

				failed_tests++;

			}

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE