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

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

Merge branch 'akpm' (patches from Andrew Morton) 

Merge fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: hugetlb: fix copy_hugetlb_page_range()
  simple_xattr: permit 0-size extended attributes
  mm/fs: fix pessimization in hole-punching pagecache
  shmem: fix splicing from a hole while it's punched
  shmem: fix faulting into a hole, not taking i_mutex
  mm: do not call do_fault_around for non-linear fault
  sh: also try passing -m4-nofpu for SH2A builds
  zram: avoid lockdep splat by revalidate_disk
  mm/rmap.c: fix pgoff calculation to handle hugepage correctly
  coredump: fix the setting of PF_DUMPCORE
parents 15ba2236 0253d634

arch/sh/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ endif 


cflags-$(CONFIG_CPU_SH2)		:= $(call cc-option,-m2,)

cflags-$(CONFIG_CPU_SH2A)		+= $(call cc-option,-m2a,) \

					   $(call cc-option,-m2a-nofpu,)

					   $(call cc-option,-m2a-nofpu,) \

					   $(call cc-option,-m4-nofpu,)

cflags-$(CONFIG_CPU_SH3)		:= $(call cc-option,-m3,)

cflags-$(CONFIG_CPU_SH4)		:= $(call cc-option,-m4,) \

	$(call cc-option,-mno-implicit-fp,-m4-nofpu)

drivers/block/zram/zram_drv.c

+18 −4
Original line number Diff line number Diff line
@@ -622,11 +622,18 @@ static void zram_reset_device(struct zram *zram, bool reset_capacity) 
	memset(&zram->stats, 0, sizeof(zram->stats));



	zram->disksize = 0;

	if (reset_capacity) {

	if (reset_capacity)

		set_capacity(zram->disk, 0);

		revalidate_disk(zram->disk);

	}



	up_write(&zram->init_lock);



	/*

	 * Revalidate disk out of the init_lock to avoid lockdep splat.

	 * It's okay because disk's capacity is protected by init_lock

	 * so that revalidate_disk always sees up-to-date capacity.

	 */

	if (reset_capacity)

		revalidate_disk(zram->disk);

}



static ssize_t disksize_store(struct device *dev,
@@ -666,8 +673,15 @@ static ssize_t disksize_store(struct device *dev, 
	zram->comp = comp;

	zram->disksize = disksize;

	set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT);

	revalidate_disk(zram->disk);

	up_write(&zram->init_lock);



	/*

	 * Revalidate disk out of the init_lock to avoid lockdep splat.

	 * It's okay because disk's capacity is protected by init_lock

	 * so that revalidate_disk always sees up-to-date capacity.

	 */

	revalidate_disk(zram->disk);



	return len;



out_destroy_comp:

fs/coredump.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ static int zap_threads(struct task_struct *tsk, struct mm_struct *mm, 
	if (unlikely(nr < 0))

		return nr;



	tsk->flags = PF_DUMPCORE;

	tsk->flags |= PF_DUMPCORE;

	if (atomic_read(&mm->mm_users) == nr + 1)

		goto done;

	/*

fs/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ struct simple_xattr *simple_xattr_alloc(const void *value, size_t size) 


	/* wrap around? */

	len = sizeof(*new_xattr) + size;

	if (len <= sizeof(*new_xattr))

	if (len < sizeof(*new_xattr))

		return NULL;



	new_xattr = kmalloc(len, GFP_KERNEL);

include/linux/pagemap.h

+12 −0
Original line number Diff line number Diff line
@@ -398,6 +398,18 @@ static inline struct page *read_mapping_page(struct address_space *mapping, 
	return read_cache_page(mapping, index, filler, data);

}



/*

 * Get the offset in PAGE_SIZE.

 * (TODO: hugepage should have ->index in PAGE_SIZE)

 */

static inline pgoff_t page_to_pgoff(struct page *page)

{

	if (unlikely(PageHeadHuge(page)))

		return page->index << compound_order(page);

	else

		return page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);

}



/*

 * Return byte-offset into filesystem object for page.

 */