linux-next: manual merge of the akpm-current tree with the vfs tree

linux-next: manual merge of the akpm-current tree with the vfs tree

[Michael Ellerman]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/ufs/namei.c

between commit:

  a50e4a02ad69 "ufs: don't bother with lock_ufs()/unlock_ufs() for directory access"

from the vfs tree and commit:

  2ce1efe3965b "fs/ufs: revert "ufs: fix deadlocks introduced by sb mutex merge"

from the akpm-current tree.

I fixed it up by taking the vfs version and can carry the fix as necessary (no
action is required).

cheers

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2343 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  kernel/cgroup/cgroup.c

between commit:

  58e4e43911f8 ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")

from the vfs tree and commit:

  dbe8cec5a8a3 ("mm, oom: add cgroup v2 mount option for cgroup-aware OOM killer")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/cgroup/cgroup.c
index 33a11d941d11,de25822590d0..000000000000
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@@ -1734,23 -1734,28 +1734,30 @@@ int cgroup_show_path(struct seq_file *s
  	return len;
  }
  
 -static int parse_cgroup_root_flags(char *data, unsigned int *root_flags)
 +static int cgroup2_parse_option(struct fs_context *fc, char *token)
  {
 -	char *token;
 +	struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
  
 -	*root_flags = 0;
 -
 -	if (!data)
 +	if (!strcmp(token, "nsdelegate")) {
 +		ctx->flags |= CGRP_ROOT_NS_DELEGATE;
 +		return 0;
 +	}
++	if (!strcmp(token, "groupoom")) {
++		ctx->flags |= CGRP_GROUP_OOM;
+ 		return 0;
++	}
  
 -	while ((token = strsep(&data, ",")) != NULL) {
 -		if (!strcmp(token, "nsdelegate")) {
 -			*root_flags |= CGRP_ROOT_NS_DELEGATE;
 -			continue;
 -		} else if (!strcmp(token, "groupoom")) {
 -			*root_flags |= CGRP_GROUP_OOM;
 -			continue;
 -		}
 +	return -EINVAL;
 +}
  
 -		pr_err("cgroup2: unknown option \"%s\"\n", token);
 -		return -EINVAL;
 +static int cgroup_show_options(struct seq_file *seq, struct kernfs_root *kf_root)
 +{
- 	if (current->nsproxy->cgroup_ns == &init_cgroup_ns &&
- 	    cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
- 		seq_puts(seq, ",nsdelegate");
++	if (current->nsproxy->cgroup_ns == &init_cgroup_ns) {
++		if (cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
++			seq_puts(seq, ",nsdelegate");
++		if (cgrp_dfl_root.flags & CGRP_GROUP_OOM)
++			seq_puts(seq, ",groupoom");
+ 	}
 -
  	return 0;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1538 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/proc/base.c

between commit:

  0168b9e38c42 ("procfs: switch instantiate_t to d_splice_alias()")

from the vfs tree and commit:

  a1cb629945be ("proc: skip branch in /proc/*/* lookup")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/proc/base.c
index af128b374143,9b02b88e0b91..000000000000
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@@ -2479,17 -2457,14 +2451,14 @@@ static struct dentry *proc_pident_looku
  	for (p = ents; p < last; p++) {
  		if (p->len != dentry->d_name.len)
  			continue;
- 		if (!memcmp(dentry->d_name.name, p->name, p->len))
+ 		if (!memcmp(dentry->d_name.name, p->name, p->len)) {
 -			error = proc_pident_instantiate(dir, dentry, task, p);
++			res = proc_pident_instantiate(dentry, task, p);
  			break;
+ 		}
  	}
- 	if (p >= last)
- 		goto out;
- 
- 	res = proc_pident_instantiate(dentry, task, p);
- out:
  	put_task_struct(task);
  out_no_task:
 -	return ERR_PTR(error);
 +	return res;
  }
  
  static int proc_pident_readdir(struct file *file, struct dir_context *ctx,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  fs/hugetlbfs/inode.c

between commit:

  4a25220d4e43 ("hugetlbfs: Implement show_options")

from the vfs tree and commit:

  25153b1fbd8a ("mm: hwpoison: dissolve in-use hugepage in unrecoverable memory error")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/hugetlbfs/inode.c
index 99b3b9836575,52388611635e..000000000000
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@@ -851,46 -851,16 +851,56 @@@ static int hugetlbfs_migrate_page(struc
  	return MIGRATEPAGE_SUCCESS;
  }
  
 +/*
 + * Display the mount options in /proc/mounts.
 + */
 +static int hugetlbfs_show_options(struct seq_file *m, struct dentry *root)
 +{
 +	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(root->d_sb);
 +	struct hugepage_subpool *spool = sbinfo->spool;
 +	unsigned long hpage_size = huge_page_size(sbinfo->hstate);
 +	unsigned hpage_shift = huge_page_shift(sbinfo->hstate);
 +	char mod;
 +
 +	if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
 +		seq_printf(m, ",uid=%u",
 +			   from_kuid_munged(&init_user_ns, sbinfo->uid));
 +	if (!gid_eq(sbinfo->gid, GLOBAL_ROOT_GID))
 +		seq_printf(m, ",gid=%u",
 +			   from_kgid_munged(&init_user_ns, sbinfo->gid));
 +	if (sbinfo->mode != 0755)
 +		seq_printf(m, ",mode=%o", sbinfo->mode);
 +	if (sbinfo->max_inodes != -1)
 +		seq_printf(m, ",nr_inodes=%lu", sbinfo->max_inodes);
 +
 +	hpage_size /= 1024;
 +	mod = 'K';
 +	if (hpage_size >= 1024) {
 +		hpage_size /= 1024;
 +		mod = 'M';
 +	}
 +	seq_printf(m, ",pagesize=%lu%c", hpage_size, mod);
 +	if (spool) {
 +		if (spool->max_hpages != -1)
 +			seq_printf(m, ",size=%llu",
 +				   (unsigned long long)spool->max_hpages << hpage_shift);
 +		if (spool->min_hpages != -1)
 +			seq_printf(m, ",min_size=%llu",
 +				   (unsigned long long)spool->min_hpages << hpage_shift);
 +	}
 +	return 0;
 +}
 +
+ static int hugetlbfs_error_remove_page(struct address_space *mapping,
+ 				struct page *page)
+ {
+ 	struct inode *inode = mapping->host;
+ 
+ 	remove_huge_page(page);
+ 	hugetlb_fix_reserve_counts(inode);
+ 	return 0;
+ }
+ 
  static int hugetlbfs_statfs(struct dentry *dentry, struct kstatfs *buf)
  {
  	struct hugetlbfs_sb_info *sbinfo = HUGETLBFS_SB(dentry->d_sb);

Re: linux-next: manual merge of the akpm-current tree with the vfs tree

[Vlastimil Babka]

On 01/11/2016 08:48 AM, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   lib/vsprintf.c
> 
> between commit:
> 
>   1031bc589228 ("lib/vsprintf: add %*pg format specifier")
> 
> from the vfs tree and commit:
> 
>   88f2367418d7 ("mm, printk: introduce new format string for flags")
> 
> from the akpm-current tree.

Ouch, thanks for the heads-up.

> I fixed it up (I switched the latter to 'j' since there were less of
> them to fix up - see below) and can carry the fix as necessary (no action
> is required).

Next mmotm shouldn't have this series anymore (it's already gone in mmots) due
to a substantial non-incremental rewrite which I will resubmit after 4.5-rc1, so
I'll consider going with the 'j' or pick a new character. Thanks.

> I also added this patch to fix up all the new uses.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 Jan 2016 18:42:34 +1100
> Subject: [PATCH] mm-printk-introduce-new-format-string-for-flags-fix-3
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/printk-formats.txt | 6 +++---
>  mm/debug.c                       | 6 +++---
>  mm/oom_kill.c                    | 2 +-
>  mm/page_alloc.c                  | 4 ++--
>  mm/page_owner.c                  | 6 +++---
>  5 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
> index ad9eeba1768f..ba139ca32e86 100644
> --- a/Documentation/printk-formats.txt
> +++ b/Documentation/printk-formats.txt
> @@ -300,9 +300,9 @@ bitmap and its derivatives such as cpumask and nodemask:
>  
>  Flags bitfields such as page flags, gfp_flags:
>  
> -	%pgp	referenced|uptodate|lru|active|private
> -	%pgg	GFP_USER|GFP_DMA32|GFP_NOWARN
> -	%pgv	read|exec|mayread|maywrite|mayexec|denywrite
> +	%pjp	referenced|uptodate|lru|active|private
> +	%pjg	GFP_USER|GFP_DMA32|GFP_NOWARN
> +	%pjv	read|exec|mayread|maywrite|mayexec|denywrite
>  
>  	For printing flags bitfields as a collection of symbolic constants that
>  	would construct the value. The type of flags is given by the third
> diff --git a/mm/debug.c b/mm/debug.c
> index adfec056aca8..0ea2db2183e8 100644
> --- a/mm/debug.c
> +++ b/mm/debug.c
> @@ -118,7 +118,7 @@ void __dump_page(struct page *page, const char *reason)
>  		  page->mapping, page->index);
>  	BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);
>  
> -	pr_emerg("flags: %#lx(%pgp)\n", page->flags, &page->flags);
> +	pr_emerg("flags: %#lx(%pjp)\n", page->flags, &page->flags);
>  
>  	if (reason)
>  		pr_alert("page dumped because: %s\n", reason);
> @@ -143,7 +143,7 @@ void dump_vma(const struct vm_area_struct *vma)
>  		"next %p prev %p mm %p\n"
>  		"prot %lx anon_vma %p vm_ops %p\n"
>  		"pgoff %lx file %p private_data %p\n"
> -		"flags: %#lx(%pgv)\n",
> +		"flags: %#lx(%pjv)\n",
>  		vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next,
>  		vma->vm_prev, vma->vm_mm,
>  		(unsigned long)pgprot_val(vma->vm_page_prot),
> @@ -220,7 +220,7 @@ void dump_mm(const struct mm_struct *mm)
>  		""		/* This is here to not have a comma! */
>  		);
>  
> -	pr_emerg("def_flags: %#lx(%pgv)\n", mm->def_flags, &mm->def_flags);
> +	pr_emerg("def_flags: %#lx(%pjv)\n", mm->def_flags, &mm->def_flags);
>  }
>  
>  #endif		/* CONFIG_DEBUG_VM */
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index b8a4210929cc..8579d26f2c32 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -405,7 +405,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p,
>  			struct mem_cgroup *memcg)
>  {
>  	pr_warning("%s invoked oom-killer: order=%d, oom_score_adj=%hd, "
> -			"gfp_mask=%#x(%pgg)\n",
> +			"gfp_mask=%#x(%pjg)\n",
>  		current->comm, oc->order, current->signal->oom_score_adj,
>  		oc->gfp_mask, &oc->gfp_mask);
>  
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 3c3a5c52d277..42536a624a03 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -444,7 +444,7 @@ static void bad_page(struct page *page, const char *reason,
>  	__dump_page(page, reason);
>  	bad_flags &= page->flags;
>  	if (bad_flags)
> -		pr_alert("bad because of flags: %#lx(%pgp)\n",
> +		pr_alert("bad because of flags: %#lx(%pjp)\n",
>  						bad_flags, &bad_flags);
>  	dump_page_owner(page);
>  
> @@ -2708,7 +2708,7 @@ void warn_alloc_failed(gfp_t gfp_mask, unsigned int order, const char *fmt, ...)
>  		va_end(args);
>  	}
>  
> -	pr_warn("%s: page allocation failure: order:%u, mode:%#x(%pgg)\n",
> +	pr_warn("%s: page allocation failure: order:%u, mode:%#x(%pjg)\n",
>  		current->comm, order, gfp_mask, &gfp_mask);
>  	dump_stack();
>  	if (!should_suppress_show_mem())
> diff --git a/mm/page_owner.c b/mm/page_owner.c
> index 011377548b4f..afb7a444fb08 100644
> --- a/mm/page_owner.c
> +++ b/mm/page_owner.c
> @@ -135,7 +135,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
>  		return -ENOMEM;
>  
>  	ret = snprintf(kbuf, count,
> -			"Page allocated via order %u, mask %#x(%pgg)\n",
> +			"Page allocated via order %u, mask %#x(%pjg)\n",
>  			page_ext->order, page_ext->gfp_mask,
>  			&page_ext->gfp_mask);
>  
> @@ -146,7 +146,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
>  	pageblock_mt = get_pfnblock_migratetype(page, pfn);
>  	page_mt  = gfpflags_to_migratetype(page_ext->gfp_mask);
>  	ret += snprintf(kbuf + ret, count - ret,
> -			"PFN %lu type %s Block %lu type %s Flags %#lx(%pgp)\n",
> +			"PFN %lu type %s Block %lu type %s Flags %#lx(%pjp)\n",
>  			pfn,
>  			migratetype_names[page_mt],
>  			pfn >> pageblock_order,
> @@ -199,7 +199,7 @@ void __dump_page_owner(struct page *page)
>  	}
>  
>  	pr_alert("page allocated via order %u, migratetype %s, "
> -			"gfp_mask %#x(%pgg)\n", page_ext->order,
> +			"gfp_mask %#x(%pjg)\n", page_ext->order,
>  			migratetype_names[mt], gfp_mask, &gfp_mask);
>  	print_stack_trace(&trace, 0);
>  
> 

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  lib/vsprintf.c

between commit:

  1031bc589228 ("lib/vsprintf: add %*pg format specifier")

from the vfs tree and commit:

  88f2367418d7 ("mm, printk: introduce new format string for flags")

from the akpm-current tree.

I fixed it up (I switched the latter to 'j' since there were less of
them to fix up - see below) and can carry the fix as necessary (no action
is required).

I also added this patch to fix up all the new uses.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 Jan 2016 18:42:34 +1100
Subject: [PATCH] mm-printk-introduce-new-format-string-for-flags-fix-3

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/printk-formats.txt | 6 +++---
 mm/debug.c                       | 6 +++---
 mm/oom_kill.c                    | 2 +-
 mm/page_alloc.c                  | 4 ++--
 mm/page_owner.c                  | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index ad9eeba1768f..ba139ca32e86 100644
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -300,9 +300,9 @@ bitmap and its derivatives such as cpumask and nodemask:
 
 Flags bitfields such as page flags, gfp_flags:
 
-	%pgp	referenced|uptodate|lru|active|private
-	%pgg	GFP_USER|GFP_DMA32|GFP_NOWARN
-	%pgv	read|exec|mayread|maywrite|mayexec|denywrite
+	%pjp	referenced|uptodate|lru|active|private
+	%pjg	GFP_USER|GFP_DMA32|GFP_NOWARN
+	%pjv	read|exec|mayread|maywrite|mayexec|denywrite
 
 	For printing flags bitfields as a collection of symbolic constants that
 	would construct the value. The type of flags is given by the third
diff --git a/mm/debug.c b/mm/debug.c
index adfec056aca8..0ea2db2183e8 100644
--- a/mm/debug.c
+++ b/mm/debug.c
@@ -118,7 +118,7 @@ void __dump_page(struct page *page, const char *reason)
 		  page->mapping, page->index);
 	BUILD_BUG_ON(ARRAY_SIZE(pageflag_names) != __NR_PAGEFLAGS + 1);
 
-	pr_emerg("flags: %#lx(%pgp)\n", page->flags, &page->flags);
+	pr_emerg("flags: %#lx(%pjp)\n", page->flags, &page->flags);
 
 	if (reason)
 		pr_alert("page dumped because: %s\n", reason);
@@ -143,7 +143,7 @@ void dump_vma(const struct vm_area_struct *vma)
 		"next %p prev %p mm %p\n"
 		"prot %lx anon_vma %p vm_ops %p\n"
 		"pgoff %lx file %p private_data %p\n"
-		"flags: %#lx(%pgv)\n",
+		"flags: %#lx(%pjv)\n",
 		vma, (void *)vma->vm_start, (void *)vma->vm_end, vma->vm_next,
 		vma->vm_prev, vma->vm_mm,
 		(unsigned long)pgprot_val(vma->vm_page_prot),
@@ -220,7 +220,7 @@ void dump_mm(const struct mm_struct *mm)
 		""		/* This is here to not have a comma! */
 		);
 
-	pr_emerg("def_flags: %#lx(%pgv)\n", mm->def_flags, &mm->def_flags);
+	pr_emerg("def_flags: %#lx(%pjv)\n", mm->def_flags, &mm->def_flags);
 }
 
 #endif		/* CONFIG_DEBUG_VM */
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b8a4210929cc..8579d26f2c32 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -405,7 +405,7 @@ static void dump_header(struct oom_control *oc, struct task_struct *p,
 			struct mem_cgroup *memcg)
 {
 	pr_warning("%s invoked oom-killer: order=%d, oom_score_adj=%hd, "
-			"gfp_mask=%#x(%pgg)\n",
+			"gfp_mask=%#x(%pjg)\n",
 		current->comm, oc->order, current->signal->oom_score_adj,
 		oc->gfp_mask, &oc->gfp_mask);
 
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3c3a5c52d277..42536a624a03 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -444,7 +444,7 @@ static void bad_page(struct page *page, const char *reason,
 	__dump_page(page, reason);
 	bad_flags &= page->flags;
 	if (bad_flags)
-		pr_alert("bad because of flags: %#lx(%pgp)\n",
+		pr_alert("bad because of flags: %#lx(%pjp)\n",
 						bad_flags, &bad_flags);
 	dump_page_owner(page);
 
@@ -2708,7 +2708,7 @@ void warn_alloc_failed(gfp_t gfp_mask, unsigned int order, const char *fmt, ...)
 		va_end(args);
 	}
 
-	pr_warn("%s: page allocation failure: order:%u, mode:%#x(%pgg)\n",
+	pr_warn("%s: page allocation failure: order:%u, mode:%#x(%pjg)\n",
 		current->comm, order, gfp_mask, &gfp_mask);
 	dump_stack();
 	if (!should_suppress_show_mem())
diff --git a/mm/page_owner.c b/mm/page_owner.c
index 011377548b4f..afb7a444fb08 100644
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -135,7 +135,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
 		return -ENOMEM;
 
 	ret = snprintf(kbuf, count,
-			"Page allocated via order %u, mask %#x(%pgg)\n",
+			"Page allocated via order %u, mask %#x(%pjg)\n",
 			page_ext->order, page_ext->gfp_mask,
 			&page_ext->gfp_mask);
 
@@ -146,7 +146,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
 	pageblock_mt = get_pfnblock_migratetype(page, pfn);
 	page_mt  = gfpflags_to_migratetype(page_ext->gfp_mask);
 	ret += snprintf(kbuf + ret, count - ret,
-			"PFN %lu type %s Block %lu type %s Flags %#lx(%pgp)\n",
+			"PFN %lu type %s Block %lu type %s Flags %#lx(%pjp)\n",
 			pfn,
 			migratetype_names[page_mt],
 			pfn >> pageblock_order,
@@ -199,7 +199,7 @@ void __dump_page_owner(struct page *page)
 	}
 
 	pr_alert("page allocated via order %u, migratetype %s, "
-			"gfp_mask %#x(%pgg)\n", page_ext->order,
+			"gfp_mask %#x(%pjg)\n", page_ext->order,
 			migratetype_names[mt], gfp_mask, &gfp_mask);
 	print_stack_trace(&trace, 0);
 
-- 
2.6.4



-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/vsprintf.c
index ac3f9476b776,e3f97dcc0c46..000000000000
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@@ -31,10 -31,9 +31,12 @@@
  #include <linux/dcache.h>
  #include <linux/cred.h>
  #include <net/addrconf.h>
 +#ifdef CONFIG_BLOCK
 +#include <linux/blkdev.h>
 +#endif
  
+ #include "../mm/internal.h"	/* For the trace_print_flags arrays */
+ 
  #include <asm/page.h>		/* for PAGE_SIZE */
  #include <asm/sections.h>	/* for dereference_function_descriptor() */
  #include <asm/byteorder.h>	/* cpu_to_le16 */
@@@ -600,42 -637,9 +640,29 @@@ char *dentry_name(char *buf, char *end
  			*buf = c;
  	}
  	rcu_read_unlock();
- 	if (n < spec.field_width) {
- 		/* we want to pad the sucker */
- 		unsigned spaces = spec.field_width - n;
- 		if (!(spec.flags & LEFT)) {
- 			widen(buf - n, end, n, spaces);
- 			return buf + spaces;
- 		}
- 		while (spaces--) {
- 			if (buf < end)
- 				*buf = ' ';
- 			++buf;
- 		}
- 	}
- 	return buf;
+ 	return widen_string(buf, n, end, spec);
  }
  
 +#ifdef CONFIG_BLOCK
 +static noinline_for_stack
 +char *bdev_name(char *buf, char *end, struct block_device *bdev,
 +		struct printf_spec spec, const char *fmt)
 +{
 +	struct gendisk *hd = bdev->bd_disk;
 +	
 +	buf = string(buf, end, hd->disk_name, spec);
 +	if (bdev->bd_part->partno) {
 +		if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) {
 +			if (buf < end)
 +				*buf = 'p';
 +			buf++;
 +		}
 +		buf = number(buf, end, bdev->bd_part->partno, spec);
 +	}
 +	return buf;
 +}
 +#endif
 +
  static noinline_for_stack
  char *symbol_string(char *buf, char *end, void *ptr,
  		    struct printf_spec spec, const char *fmt)
@@@ -1624,11 -1693,8 +1717,13 @@@ char *pointer(const char *fmt, char *bu
  		return dentry_name(buf, end,
  				   ((const struct file *)ptr)->f_path.dentry,
  				   spec, fmt);
 +#ifdef CONFIG_BLOCK
  	case 'g':
 +		return bdev_name(buf, end, ptr, spec, fmt);
 +#endif
 +
++	case 'j':
+ 		return flags_string(buf, end, ptr, spec, fmt);
  	}
  	spec.flags |= SMALL;
  	if (spec.field_width == -1) {

linux-next: manual merge of the akpm-current tree with the vfs tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 283 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in fs/adfs/adfs.h 
since it appears that "adfs: constify adfs_dir_ops structures" has been applied
by Al Viro. There was no conflict to resolve but git still flagged it as a conflict
for some reason.

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2702 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/hfsplus/xattr.h between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commits 2c14e8b354bd ("fs/hfsplus: move xattr_name allocation in
hfsplus_getxattr()") and a88c4defbd2e ("fs/hfsplus: move xattr_name
allocation in hfsplus_setxattr()") from the akpm-current tree.

I fixed it up (the code was moved by the latter, so I applied this
merge fix patch) and can carry the fix as necessary (no action is
required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 Apr 2015 21:07:48 +1000
Subject: [PATCH] fs/hfsplus: merge fix for d_inode() annotation

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/hfsplus/xattr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index 8c8f2cbe533a..416b1dbafe51 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -440,7 +440,7 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
 		return -ENOMEM;
 	strcpy(xattr_name, prefix);
 	strcpy(xattr_name + prefixlen, name);
-	res = __hfsplus_setxattr(dentry->d_inode, xattr_name, value, size,
+	res = __hfsplus_setxattr(d_inode(dentry), xattr_name, value, size,
 				 flags);
 	kfree(xattr_name);
 	return res;
@@ -600,7 +600,7 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
 	strcpy(xattr_name, prefix);
 	strcpy(xattr_name + prefixlen, name);
 
-	res = __hfsplus_getxattr(dentry->d_inode, xattr_name, value, size);
+	res = __hfsplus_getxattr(d_inode(dentry), xattr_name, value, size);
 	kfree(xattr_name);
 	return res;
 
@@ -868,7 +868,7 @@ static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
 	 * creates), so we pass the name through unmodified (after
 	 * ensuring it doesn't conflict with another namespace).
 	 */
-	return __hfsplus_getxattr(dentry->d_inode, name, buffer, size);
+	return __hfsplus_getxattr(d_inode(dentry), name, buffer, size);
 }
 
 static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
@@ -890,7 +890,7 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
 	 * creates), so we pass the name through unmodified (after
 	 * ensuring it doesn't conflict with another namespace).
 	 */
-	return __hfsplus_setxattr(dentry->d_inode, name, buffer, size, flags);
+	return __hfsplus_setxattr(d_inode(dentry), name, buffer, size, flags);
 }
 
 static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/befs/linuxvfs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit badfbaf2a80c ("befs: replace typedef befs_inode_info by
structure") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/befs/linuxvfs.c
index d3cb8774765f,16e0a48bfccd..000000000000
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@@ -472,7 -471,7 +471,7 @@@ static void 
  befs_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
  	struct super_block *sb = dentry->d_sb;
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
  	befs_data_stream *data = &befs_ino->i_data.ds;
  	befs_off_t len = data->size;
  	char *link;
@@@ -502,7 -501,8 +501,8 @@@
  static void *
  befs_fast_follow_link(struct dentry *dentry, struct nameidata *nd)
  {
- 	befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
 -	struct befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
++	struct befs_inode_info *befs_ino = BEFS_I(d_inode(dentry));
+ 
  	nd_set_link(nd, befs_ino->i_data.symlink);
  	return NULL;
  }

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 990 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/affs/amigaffs.c between commit 5dd3dc06371a ("VFS: normal
filesystems (and lustre): d_inode() annotations") from the vfs tree and
commit 18da6e382823 ("fs/affs: use AFFS_MOUNT prefix for mount
options") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/affs/amigaffs.c
index 40eb5814b98c,5022ac96aa40..000000000000
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@@ -471,8 -471,9 +471,9 @@@ affs_warning(struct super_block *sb, co
  bool
  affs_nofilenametruncate(const struct dentry *dentry)
  {
 -	struct inode *inode = dentry->d_inode;
 +	struct inode *inode = d_inode(dentry);
- 	return AFFS_SB(inode->i_sb)->s_flags & SF_NO_TRUNCATE;
+ 
+ 	return affs_test_opt(AFFS_SB(inode->i_sb)->s_flags, SF_NO_TRUNCATE);
  
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
lib/Makefile between commit d879cb83417a ("move iov_iter.c from mm/ to
lib/") from the vfs tree and commits 2e731a72801a ("lib: move
find_last_bit to lib/find_next_bit.c") and 2bbf16381c7a ("lib: rename
lib/find_next_bit.c to lib/find_bit.c") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc lib/Makefile
index 58f74d2dd396,442018a65723..000000000000
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -24,8 -24,8 +24,8 @@@ obj-y	+= lockref.
  
  obj-y += bcd.o div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \
  	 bust_spinlocks.o kasprintf.o bitmap.o scatterlist.o \
 -	 gcd.o lcm.o list_sort.o uuid.o flex_array.o clz_ctz.o \
 +	 gcd.o lcm.o list_sort.o uuid.o flex_array.o iov_iter.o clz_ctz.o \
- 	 bsearch.o find_last_bit.o find_next_bit.o llist.o memweight.o kfifo.o \
+ 	 bsearch.o find_bit.o llist.o memweight.o kfifo.o \
  	 percpu-refcount.o percpu_ida.o rhashtable.o reciprocal_div.o
  obj-y += string_helpers.o
  obj-$(CONFIG_TEST_STRING_HELPERS) += test-string_helpers.o

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/fat/inode.c between commit 3737c63e1fb0 ("fs: move struct kiocb to
fs.h") from the vfs tree and commit be33247df543 ("fs/fat: remove
unnecessary includes") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/fat/inode.c
index 8521207de229,8ea7fec6716d..000000000000
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@@ -11,20 -11,12 +11,11 @@@
   */
  
  #include <linux/module.h>
- #include <linux/init.h>
- #include <linux/time.h>
- #include <linux/slab.h>
- #include <linux/seq_file.h>
  #include <linux/pagemap.h>
  #include <linux/mpage.h>
- #include <linux/buffer_head.h>
- #include <linux/mount.h>
 -#include <linux/aio.h>
  #include <linux/vfs.h>
+ #include <linux/seq_file.h>
  #include <linux/parser.h>
- #include <linux/uio.h>
- #include <linux/writeback.h>
- #include <linux/log2.h>
- #include <linux/hash.h>
  #include <linux/blkdev.h>
  #include <asm/unaligned.h>
  #include "fat.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: manual merge of the akpm-current tree with the vfs tree

[Josh Triplett]

On Fri, Nov 08, 2013 at 06:38:06PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/linux/lglock.h between commit 4314ff760e8b ("no need to keep
> brlock macros anymore...") from the vfs tree and commit f5639052d567
> ("lglock: map to spinlock when !CONFIG_SMP") from the akpm-current tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This looks like the right fix.

> diff --cc include/linux/lglock.h
> index 96549abe8842,6561b1c0fa63..000000000000
> --- a/include/linux/lglock.h
> +++ b/include/linux/lglock.h
> @@@ -25,6 -25,18 +25,8 @@@
>   #include <linux/cpu.h>
>   #include <linux/notifier.h>
>   
>  -/* can make br locks by using local lock for read side, global lock for write */
>  -#define br_lock_init(name)	lg_lock_init(name, #name)
>  -#define br_read_lock(name)	lg_local_lock(name)
>  -#define br_read_unlock(name)	lg_local_unlock(name)
>  -#define br_write_lock(name)	lg_global_lock(name)
>  -#define br_write_unlock(name)	lg_global_unlock(name)
>  -
>  -#define DEFINE_BRLOCK(name)		DEFINE_LGLOCK(name)
>  -#define DEFINE_STATIC_BRLOCK(name)	DEFINE_STATIC_LGLOCK(name)
>  -
> + #ifdef CONFIG_SMP
> + 
>   #ifdef CONFIG_DEBUG_LOCK_ALLOC
>   #define LOCKDEP_INIT_MAP lockdep_init_map
>   #else

Re: linux-next: manual merge of the akpm-current tree with the vfs tree

[Oleg Nesterov]

On 11/08, Oleg Nesterov wrote:
>
> On 11/08, Stephen Rothwell wrote:
> >
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in
> > fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
> > to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs:
> > forbid open via /proc") from the akpm-current tree.
> >
> > I just dropped the akpm-current changes for today - they should probably
> > be applied to fs/libfs.c.
>
> Well, this probably means that
>
> 	anon_inodefs-forbid-open-via-proc.patch
>
> should be dropped. I'll rediff this patch against vfs.git

24b0303e9532 also removes anon_inode_fops. It seems that it was not really
needed anyway, inode_init_always() does inode->i_fop = empty_fops...

So probably we can simply change empty_fops but I need to recheck.

Oleg.

--- x/fs/inode.c
+++ x/fs/inode.c
@@ -114,6 +114,11 @@ int proc_nr_inodes(ctl_table *table, int
 }
 #endif
 
+static int empty_open(struct inode *inode, struct file *file)
+{
+	return -ENXIO;
+}
+
 /**
  * inode_init_always - perform inode structure intialisation
  * @sb: superblock inode belongs to
@@ -125,7 +130,9 @@ int proc_nr_inodes(ctl_table *table, int
 int inode_init_always(struct super_block *sb, struct inode *inode)
 {
 	static const struct inode_operations empty_iops;
-	static const struct file_operations empty_fops;
+	static const struct file_operations empty_fops = {
+		.open = empty_open,
+	};
 	struct address_space *const mapping = &inode->i_data;
 
 	inode->i_sb = sb;

Re: linux-next: manual merge of the akpm-current tree with the vfs tree

[Oleg Nesterov]

On 11/08, Stephen Rothwell wrote:
>
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
> to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs:
> forbid open via /proc") from the akpm-current tree.
>
> I just dropped the akpm-current changes for today - they should probably
> be applied to fs/libfs.c.

Well, this probably means that

	anon_inodefs-forbid-open-via-proc.patch

should be dropped. I'll rediff this patch against vfs.git

Oleg.

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1283 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/lglock.h between commit 4314ff760e8b ("no need to keep
brlock macros anymore...") from the vfs tree and commit f5639052d567
("lglock: map to spinlock when !CONFIG_SMP") from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/lglock.h
index 96549abe8842,6561b1c0fa63..000000000000
--- a/include/linux/lglock.h
+++ b/include/linux/lglock.h
@@@ -25,6 -25,18 +25,8 @@@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
  
 -/* can make br locks by using local lock for read side, global lock for write */
 -#define br_lock_init(name)	lg_lock_init(name, #name)
 -#define br_read_lock(name)	lg_local_lock(name)
 -#define br_read_unlock(name)	lg_local_unlock(name)
 -#define br_write_lock(name)	lg_global_lock(name)
 -#define br_write_unlock(name)	lg_global_unlock(name)
 -
 -#define DEFINE_BRLOCK(name)		DEFINE_LGLOCK(name)
 -#define DEFINE_STATIC_BRLOCK(name)	DEFINE_STATIC_LGLOCK(name)
 -
+ #ifdef CONFIG_SMP
+ 
  #ifdef CONFIG_DEBUG_LOCK_ALLOC
  #define LOCKDEP_INIT_MAP lockdep_init_map
  #else

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/autofs4/inode.c between commit baa40671d3e3 ("autofs4: make freeing
sbi rcu-delayed") from the vfs tree and commit e4af471815fc ("autofs4:
allow autofs to work outside the initial PID namespace") from the
akpm-current tree.

I fixed it up (I think - see below) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/autofs4/inode.c
index 3b9cc9b973c2,1b045ecfcea2..000000000000
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@@ -56,13 -56,20 +56,15 @@@ void autofs4_kill_sb(struct super_bloc
  	 * just call kill_anon_super when we are called from
  	 * deactivate_super.
  	 */
- 	if (sbi) /* Free wait queues, close pipe */
 -	if (!sbi)
 -		goto out_kill_sb;
 -
 -	/* Free wait queues, close pipe */
 -	autofs4_catatonic_mode(sbi);
 -
 -	put_pid(sbi->oz_pgrp);
 -
 -	sb->s_fs_info = NULL;
 -	kfree(sbi);
++	if (sbi) { /* Free wait queues, close pipe */
 +		autofs4_catatonic_mode(sbi);
++		put_pid(sbi->oz_pgrp);
++	}
  
 -out_kill_sb:
  	DPRINTK("shutting down");
  	kill_litter_super(sb);
 +	if (sbi)
 +		kfree_rcu(sbi, rcu);
  }
  
  static int autofs4_show_options(struct seq_file *m, struct dentry *root)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/anon_inodes.c between commit 24b0303e9532 ("take anon inode allocation
to libfs.c") from the vfs tree and commit 02f3ac4386d9 ("anon_inodefs:
forbid open via /proc") from the akpm-current tree.

I just dropped the akpm-current changes for today - they should probably
be applied to fs/libfs.c.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the akpm-current tree with the vfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 880 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
fs/proc/inode.c between commit d3d009cb965e ("saner proc_get_inode()
calling conventions") from the vfs tree and commit "fs/proc: clean up
printks" from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/proc/inode.c
index 70322e1,b4625dd..0000000
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@@ -495,7 -499,8 +496,7 @@@ int proc_fill_super(struct super_block 
  	pde_get(&proc_root);
  	root_inode = proc_get_inode(s, &proc_root);
  	if (!root_inode) {
- 		printk(KERN_ERR "proc_fill_super: get root inode failed\n");
+ 		pr_warn("proc_fill_super: get root inode failed\n");
 -		pde_put(&proc_root);
  		return -ENOMEM;
  	}
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]