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

Commit 998d7551 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Rather a lot of fixes, almost all affecting mm/"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits)
  scripts/gdb: fix debugging modules on s390
  kernel/events/uprobes.c: only do FOLL_SPLIT_PMD for uprobe register
  mm/thp: allow dropping THP from page cache
  mm/vmscan.c: support removing arbitrary sized pages from mapping
  mm/thp: fix node page state in split_huge_page_to_list()
  proc/meminfo: fix output alignment
  mm/init-mm.c: include <linux/mman.h> for vm_committed_as_batch
  mm/filemap.c: include <linux/ramfs.h> for generic_file_vm_ops definition
  mm: include <linux/huge_mm.h> for is_vma_temporary_stack
  zram: fix race between backing_dev_show and backing_dev_store
  mm/memcontrol: update lruvec counters in mem_cgroup_move_account
  ocfs2: fix panic due to ocfs2_wq is null
  hugetlbfs: don't access uninitialized memmaps in pfn_range_valid_gigantic()
  mm: memblock: do not enforce current limit for memblock_phys* family
  mm: memcg: get number of pages on the LRU list in memcgroup base on lru_zone_size
  mm/gup: fix a misnamed "write" argument, and a related bug
  mm/gup_benchmark: add a missing "w" to getopt string
  ocfs2: fix error handling in ocfs2_setattr()
  mm: memcg/slab: fix panic in __free_slab() caused by premature memcg pointer release
  mm/memunmap: don't access uninitialized memmap in memunmap_pages()
  ...
parents d418d070 585d730d

drivers/base/memory.c

+3 −0
Original line number Diff line number Diff line
@@ -540,6 +540,9 @@ static ssize_t soft_offline_page_store(struct device *dev, 
	pfn >>= PAGE_SHIFT;

	if (!pfn_valid(pfn))

		return -ENXIO;

	/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */

	if (!pfn_to_online_page(pfn))

		return -EIO;

	ret = soft_offline_page(pfn_to_page(pfn), 0);

	return ret == 0 ? count : ret;

}

drivers/block/zram/zram_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -413,13 +413,14 @@ static void reset_bdev(struct zram *zram) 
static ssize_t backing_dev_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct file *file;

	struct zram *zram = dev_to_zram(dev);

	struct file *file = zram->backing_dev;

	char *p;

	ssize_t ret;



	down_read(&zram->init_lock);

	if (!zram->backing_dev) {

	file = zram->backing_dev;

	if (!file) {

		memcpy(buf, "none\n", 5);

		up_read(&zram->init_lock);

		return 5;

fs/ocfs2/file.c

+2 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
			transfer_to[USRQUOTA] = dqget(sb, make_kqid_uid(attr->ia_uid));

			if (IS_ERR(transfer_to[USRQUOTA])) {

				status = PTR_ERR(transfer_to[USRQUOTA]);

				transfer_to[USRQUOTA] = NULL;

				goto bail_unlock;

			}

		}
@@ -1239,6 +1240,7 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr) 
			transfer_to[GRPQUOTA] = dqget(sb, make_kqid_gid(attr->ia_gid));

			if (IS_ERR(transfer_to[GRPQUOTA])) {

				status = PTR_ERR(transfer_to[GRPQUOTA]);

				transfer_to[GRPQUOTA] = NULL;

				goto bail_unlock;

			}

		}

fs/ocfs2/journal.c

+2 −1
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ void ocfs2_recovery_exit(struct ocfs2_super *osb) 
	/* At this point, we know that no more recovery threads can be

	 * launched, so wait for any recovery completion work to

	 * complete. */

	if (osb->ocfs2_wq)

		flush_workqueue(osb->ocfs2_wq);



	/*

fs/ocfs2/localalloc.c

+2 −1
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ void ocfs2_shutdown_local_alloc(struct ocfs2_super *osb) 
	struct ocfs2_dinode *alloc = NULL;



	cancel_delayed_work(&osb->la_enable_wq);

	if (osb->ocfs2_wq)

		flush_workqueue(osb->ocfs2_wq);



	if (osb->local_alloc_state == OCFS2_LA_UNUSED)