Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-02-03 23:56:23 +0100
committerMichal Kubecek <mkubecek@suse.cz>2019-02-03 23:56:23 +0100
commita42dcc6255cfc0c627b8e22df3cc345dc78562c5 (patch)
treefaa129419fc67de8aaa4b5125d692bb572e5e890
parenta8fc1440eeb6945492460f4638c9fb8754851670 (diff)
Update to 5.0-rc5
- Config changes: - x86: - X86_RESCTRL renamed to X86_CPU_RESCTRL
-rw-r--r--config/i386/pae4
-rw-r--r--config/x86_64/default4
-rw-r--r--patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch19
-rw-r--r--rpm/config.sh2
4 files changed, 14 insertions, 15 deletions
diff --git a/config/i386/pae b/config/i386/pae
index 2833f95a70..fa1f71ba5e 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.0.0-rc3 Kernel Configuration
+# Linux/i386 5.0.0-rc5 Kernel Configuration
#
#
@@ -274,7 +274,7 @@ CONFIG_X86_FEATURE_NAMES=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_X86_RESCTRL=y
+CONFIG_X86_CPU_RESCTRL=y
CONFIG_X86_BIGSMP=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_GOLDFISH is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index ec91de0db4..c643736cdf 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.0.0-rc3 Kernel Configuration
+# Linux/x86_64 5.0.0-rc5 Kernel Configuration
#
#
@@ -285,7 +285,7 @@ CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
# CONFIG_GOLDFISH is not set
CONFIG_RETPOLINE=y
-CONFIG_X86_RESCTRL=y
+CONFIG_X86_CPU_RESCTRL=y
CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_NUMACHIP is not set
# CONFIG_X86_VSMP is not set
diff --git a/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch b/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch
index e7f759f60e..1e6774ec82 100644
--- a/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch
+++ b/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch
@@ -1,22 +1,20 @@
-From 771f2f4192e479781e367cbba7ccd3b8bda5dd55 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 2 Jun 2016 13:50:44 +0200
References: bsc#951844 bsc#1024015 bsc#1099745
Patch-mainline: never, ugly <dsterba: ugly but necessary, upstream fix will be more involved>
-Subject: [PATCH] btrfs: serialize subvolume mounts with potentially
- mismatching rw flags
+Subject: [PATCH] btrfs: serialize subvolume mounts with potentially mismatching rw flags
Racing subvolume mounts with mixed ro/rw flags can fail if the mount and
remount are not done atomically.
Signed-off-by: David Sterba <dsterba@suse.com>
---
- fs/btrfs/super.c | 23 +++++++++++++++++++++++
+ fs/btrfs/super.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
-@@ -1646,6 +1646,7 @@ static struct dentry *btrfs_mount(struct
+@@ -1599,6 +1599,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
char *subvol_name = NULL;
u64 subvol_objectid = 0;
int error = 0;
@@ -24,7 +22,7 @@ Signed-off-by: David Sterba <dsterba@suse.com>
if (!(flags & SB_RDONLY))
mode |= FMODE_WRITE;
-@@ -1657,6 +1658,24 @@ static struct dentry *btrfs_mount(struct
+@@ -1610,6 +1611,24 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
return ERR_PTR(error);
}
@@ -49,19 +47,20 @@ Signed-off-by: David Sterba <dsterba@suse.com>
/* mount device's root (/) */
mnt_root = vfs_kern_mount(&btrfs_root_fs_type, flags, device_name, data);
if (PTR_ERR_OR_ZERO(mnt_root) == -EBUSY) {
-@@ -1668,6 +1687,7 @@ static struct dentry *btrfs_mount(struct
+@@ -1621,6 +1640,7 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
flags | SB_RDONLY, device_name, data);
if (IS_ERR(mnt_root)) {
root = ERR_CAST(mnt_root);
+ mutex_unlock(&subvol_lock);
+ kfree(subvol_name);
goto out;
}
-
-@@ -1677,10 +1697,13 @@ static struct dentry *btrfs_mount(struct
+@@ -1631,11 +1651,14 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
if (error < 0) {
root = ERR_PTR(error);
mntput(mnt_root);
+ mutex_unlock(&subvol_lock);
+ kfree(subvol_name);
goto out;
}
}
@@ -70,4 +69,4 @@ Signed-off-by: David Sterba <dsterba@suse.com>
+
if (IS_ERR(mnt_root)) {
root = ERR_CAST(mnt_root);
- goto out;
+ kfree(subvol_name);
diff --git a/rpm/config.sh b/rpm/config.sh
index 093825d8c1..95440c4fe3 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.0-rc4
+SRCVERSION=5.0-rc5
# variant of the kernel-source package, either empty or "-rt"
VARIANT=
# buildservice projects to build the kernel against