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

Merge branch 'akpm' (patches from Andrew) 

Merge still more updates from Andrew Morton:
 "16 patches.

  Subsystems affected by this patch series: ofs2, nilfs2, mailmap, and
  mm (madvise, mlock, mfence, memory-failure, kasan, debug, kmemleak,
  and damon)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/damon: prevent activated scheme from sleeping by deactivated schemes
  mm/kmemleak: reset tag when compare object pointer
  doc/vm/page_owner.rst: remove content related to -c option
  tools/vm/page_owner_sort.c: remove -c option
  mm, kasan: fix __GFP_BITS_SHIFT definition breaking LOCKDEP
  mm,hwpoison: unmap poisoned page before invalidation
  mailmap: update Kirill's email
  mm: kfence: fix objcgs vector allocation
  mm/munlock: protect the per-CPU pagevec by a local_lock_t
  mm/munlock: update Documentation/vm/unevictable-lru.rst
  mm/munlock: add lru_add_drain() to fix memcg_stat_test
  nilfs2: get rid of nilfs_mapping_init()
  nilfs2: fix lockdep warnings during disk space reclamation
  nilfs2: fix lockdep warnings in page operations for btree nodes
  ocfs2: fix crash when mount with quota enabled
  Revert "mm: madvise: skip unmapped vma holes passed to process_madvise"
parents d0d642a5 78049e94

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com> 
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>

Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>

Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Documentation/vm/page_owner.rst

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ Usage 
   additional function:



	Cull:

		-c		Cull by comparing stacktrace instead of total block.

		--cull <rules>

				Specify culling rules.Culling syntax is key[,key[,...]].Choose a

				multi-letter key from the **STANDARD FORMAT SPECIFIERS** section.

Documentation/vm/unevictable-lru.rst

+210 −261

File changed.

Preview size limit exceeded, changes collapsed.

fs/nilfs2/btnode.c

+20 −3
Original line number Diff line number Diff line
@@ -20,6 +20,23 @@ 
#include "page.h"

#include "btnode.h"





/**

 * nilfs_init_btnc_inode - initialize B-tree node cache inode

 * @btnc_inode: inode to be initialized

 *

 * nilfs_init_btnc_inode() sets up an inode for B-tree node cache.

 */

void nilfs_init_btnc_inode(struct inode *btnc_inode)

{

	struct nilfs_inode_info *ii = NILFS_I(btnc_inode);



	btnc_inode->i_mode = S_IFREG;

	ii->i_flags = 0;

	memset(&ii->i_bmap_data, 0, sizeof(struct nilfs_bmap));

	mapping_set_gfp_mask(btnc_inode->i_mapping, GFP_NOFS);

}



void nilfs_btnode_cache_clear(struct address_space *btnc)

{

	invalidate_mapping_pages(btnc, 0, -1);
@@ -29,7 +46,7 @@ void nilfs_btnode_cache_clear(struct address_space *btnc) 
struct buffer_head *

nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr)

{

	struct inode *inode = NILFS_BTNC_I(btnc);

	struct inode *inode = btnc->host;

	struct buffer_head *bh;



	bh = nilfs_grab_buffer(inode, btnc, blocknr, BIT(BH_NILFS_Node));
@@ -57,7 +74,7 @@ int nilfs_btnode_submit_block(struct address_space *btnc, __u64 blocknr, 
			      struct buffer_head **pbh, sector_t *submit_ptr)

{

	struct buffer_head *bh;

	struct inode *inode = NILFS_BTNC_I(btnc);

	struct inode *inode = btnc->host;

	struct page *page;

	int err;
@@ -157,7 +174,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, 
				    struct nilfs_btnode_chkey_ctxt *ctxt)

{

	struct buffer_head *obh, *nbh;

	struct inode *inode = NILFS_BTNC_I(btnc);

	struct inode *inode = btnc->host;

	__u64 oldkey = ctxt->oldkey, newkey = ctxt->newkey;

	int err;

fs/nilfs2/btnode.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct nilfs_btnode_chkey_ctxt { 
	struct buffer_head *newbh;

};



void nilfs_init_btnc_inode(struct inode *btnc_inode);

void nilfs_btnode_cache_clear(struct address_space *);

struct buffer_head *nilfs_btnode_create_block(struct address_space *btnc,

					      __u64 blocknr);