linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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(, ",")) != 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 == _cgroup_ns &&
- cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
- seq_puts(seq, ",nsdelegate");
++ if (current->nsproxy->cgroup_ns == _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;
}
pgpyvIoJlll8B.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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(, ",")) != 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 == _cgroup_ns &&
- cgrp_dfl_root.flags & CGRP_ROOT_NS_DELEGATE)
- seq_puts(seq, ",nsdelegate");
++ if (current->nsproxy->cgroup_ns == _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;
}
pgpyvIoJlll8B.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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,
pgpdqkeBAH6Ti.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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,
pgpdqkeBAH6Ti.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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(_user_ns, sbinfo->uid));
+ if (!gid_eq(sbinfo->gid, GLOBAL_ROOT_GID))
+ seq_printf(m, ",gid=%u",
+ from_kgid_munged(_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);
linux-next: manual merge of the akpm-current tree with the vfs tree
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..
--- 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(_user_ns, sbinfo->uid));
+ if (!gid_eq(sbinfo->gid, GLOBAL_ROOT_GID))
+ seq_printf(m, ",gid=%u",
+ from_kgid_munged(_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);
linux-next: manual merge of the akpm-current tree with the vfs tree
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. pgp35AjwPaPEu.pgp Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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. pgp35AjwPaPEu.pgp Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the akpm-current tree with the vfs tree
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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the akpm-current tree with the vfs tree
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
Date: Mon, 13 Apr 2015 21:07:48 +1000
Subject: [PATCH] fs/hfsplus: merge fix for d_inode() annotation
Signed-off-by: Stephen Rothwell
---
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 Rothwells...@canb.auug.org.au
pgp2GHGPePZQp.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/befs/linuxvfs.c
index d3cb8774765f,16e0a48bfccd..
--- 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 = _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;
}
pgpXCKpZKvmau.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/affs/amigaffs.c
index 40eb5814b98c,5022ac96aa40..
--- 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);
}
pgpJ3ucn8hC8C.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 s...@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 s...@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 Rothwells...@canb.auug.org.au pgp2GHGPePZQp.pgp Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/affs/amigaffs.c
index 40eb5814b98c,5022ac96aa40..
--- 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);
}
pgpJ3ucn8hC8C.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/befs/linuxvfs.c
index d3cb8774765f,16e0a48bfccd..
--- 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;
}
pgpXCKpZKvmau.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc lib/Makefile
index 58f74d2dd396,442018a65723..
--- 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
pgpO_C8Q6BVlE.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/fat/inode.c
index 8521207de229,8ea7fec6716d..
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@@ -11,20 -11,12 +11,11 @@@
*/
#include
- #include
- #include
- #include
- #include
#include
#include
- #include
- #include
-#include
#include
+ #include
#include
- #include
- #include
- #include
- #include
#include
#include
#include "fat.h"
pgplAy8u4lONY.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au diff --cc lib/Makefile index 58f74d2dd396,442018a65723.. --- 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 pgpO_C8Q6BVlE.pgp Description: OpenPGP digital signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au diff --cc fs/fat/inode.c index 8521207de229,8ea7fec6716d.. --- 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 pgplAy8u4lONY.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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..
> --- a/include/linux/lglock.h
> +++ b/include/linux/lglock.h
> @@@ -25,6 -25,18 +25,8 @@@
> #include
> #include
>
> -/* 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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 = >i_data;
inode->i_sb = sb;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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;
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the akpm-current tree with the vfs tree
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.. --- 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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc include/linux/lglock.h
index 96549abe8842,6561b1c0fa63..
--- a/include/linux/lglock.h
+++ b/include/linux/lglock.h
@@@ -25,6 -25,18 +25,8 @@@
#include
#include
-/* 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
pgp74X0GiabrD.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/autofs4/inode.c
index 3b9cc9b973c2,1b045ecfcea2..
--- 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)
pgp_HE2GEWBoK.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
pgpHV1O64eFuZ.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au pgpHV1O64eFuZ.pgp Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/autofs4/inode.c
index 3b9cc9b973c2,1b045ecfcea2..
--- 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)
pgp_HE2GEWBoK.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au diff --cc include/linux/lglock.h index 96549abe8842,6561b1c0fa63.. --- 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 pgp74X0GiabrD.pgp Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/proc/inode.c
index 70322e1,b4625dd..000
--- 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(_root);
root_inode = proc_get_inode(s, _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(_root);
return -ENOMEM;
}
pgpLHamxBuImw.pgp
Description: PGP signature
linux-next: manual merge of the akpm-current tree with the vfs tree
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 Rothwells...@canb.auug.org.au
diff --cc fs/proc/inode.c
index 70322e1,b4625dd..000
--- 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;
}
pgpLHamxBuImw.pgp
Description: PGP signature
