diff options
| -rw-r--r-- | fs/super.c | 4 | ||||
| -rw-r--r-- | kernel/cgroup/cgroup-v1.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/super.c b/fs/super.c index 0ebb5c11fa56..583a0124bc39 100644 --- a/fs/super.c +++ b/fs/super.c | |||
| @@ -1467,8 +1467,10 @@ int vfs_get_tree(struct fs_context *fc) | |||
| 1467 | struct super_block *sb; | 1467 | struct super_block *sb; |
| 1468 | int error; | 1468 | int error; |
| 1469 | 1469 | ||
| 1470 | if (fc->fs_type->fs_flags & FS_REQUIRES_DEV && !fc->source) | 1470 | if (fc->fs_type->fs_flags & FS_REQUIRES_DEV && !fc->source) { |
| 1471 | errorf(fc, "Filesystem requires source device"); | ||
| 1471 | return -ENOENT; | 1472 | return -ENOENT; |
| 1473 | } | ||
| 1472 | 1474 | ||
| 1473 | if (fc->root) | 1475 | if (fc->root) |
| 1474 | return -EBUSY; | 1476 | return -EBUSY; |
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index 571ef3447426..c126b34fd4ff 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <trace/events/cgroup.h> | 18 | #include <trace/events/cgroup.h> |
| 19 | 19 | ||
| 20 | #define cg_invalf(fc, fmt, ...) ({ pr_err(fmt, ## __VA_ARGS__); -EINVAL; }) | 20 | #define cg_invalf(fc, fmt, ...) invalf(fc, fmt, ## __VA_ARGS__) |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| 23 | * pidlists linger the following amount before being destroyed. The goal | 23 | * pidlists linger the following amount before being destroyed. The goal |
