Skip to content

Commit 7b47a9e

Browse files
committedMar 12, 2019
Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs mount infrastructure updates from Al Viro: "The rest of core infrastructure; no new syscalls in that pile, but the old parts are switched to new infrastructure. At that point conversions of individual filesystems can happen independently; some are done here (afs, cgroup, procfs, etc.), there's also a large series outside of that pile dealing with NFS (quite a bit of option-parsing stuff is getting used there - it's one of the most convoluted filesystems in terms of mount-related logics), but NFS bits are the next cycle fodder. It got seriously simplified since the last cycle; documentation is probably the weakest bit at the moment - I considered dropping the commit introducing Documentation/filesystems/mount_api.txt (cutting the size increase by quarter ;-), but decided that it would be better to fix it up after -rc1 instead. That pile allows to do followup work in independent branches, which should make life much easier for the next cycle. fs/super.c size increase is unpleasant; there's a followup series that allows to shrink it considerably, but I decided to leave that until the next cycle" * 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (41 commits) afs: Use fs_context to pass parameters over automount afs: Add fs_context support vfs: Add some logging to the core users of the fs_context log vfs: Implement logging through fs_context vfs: Provide documentation for new mount API vfs: Remove kern_mount_data() hugetlbfs: Convert to fs_context cpuset: Use fs_context kernfs, sysfs, cgroup, intel_rdt: Support fs_context cgroup: store a reference to cgroup_ns into cgroup_fs_context cgroup1_get_tree(): separate "get cgroup_root to use" into a separate helper cgroup_do_mount(): massage calling conventions cgroup: stash cgroup_root reference into cgroup_fs_context cgroup2: switch to option-by-option parsing cgroup1: switch to option-by-option parsing cgroup: take options parsing into ->parse_monolithic() cgroup: fold cgroup1_mount() into cgroup1_get_tree() cgroup: start switching to fs_context ipc: Convert mqueue fs to fs_context proc: Add fs_context support to procfs ...
2 parents dbc2fba + c99c217 commit 7b47a9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4357
-1332
lines changed
 

‎Documentation/filesystems/mount_api.txt

+709
Large diffs are not rendered by default.

‎arch/x86/kernel/cpu/resctrl/internal.h

+16
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <linux/sched.h>
66
#include <linux/kernfs.h>
7+
#include <linux/fs_context.h>
78
#include <linux/jump_label.h>
89

910
#define MSR_IA32_L3_QOS_CFG 0xc81
@@ -40,6 +41,21 @@
4041
#define RMID_VAL_ERROR BIT_ULL(63)
4142
#define RMID_VAL_UNAVAIL BIT_ULL(62)
4243

44+
45+
struct rdt_fs_context {
46+
struct kernfs_fs_context kfc;
47+
bool enable_cdpl2;
48+
bool enable_cdpl3;
49+
bool enable_mba_mbps;
50+
};
51+
52+
static inline struct rdt_fs_context *rdt_fc2context(struct fs_context *fc)
53+
{
54+
struct kernfs_fs_context *kfc = fc->fs_private;
55+
56+
return container_of(kfc, struct rdt_fs_context, kfc);
57+
}
58+
4359
DECLARE_STATIC_KEY_FALSE(rdt_enable_key);
4460

4561
/**

0 commit comments

Comments
 (0)
Please sign in to comment.