Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Bohac <jbohac@suse.cz>2012-11-29 23:12:17 +0100
committerJiri Bohac <jbohac@suse.cz>2012-11-29 23:12:17 +0100
commitf3be9d01210c70b5229608415774afb51c2f7ac2 (patch)
tree0b4dc16e154f5ea8a2fbff4a6ad4bf6dcbcefdef
parentc065cfa243fe886bed4919f02e160ae8c1dd4c6a (diff)
parentdc316e852d3a0eeacd4784da6319d5bbbde0e078 (diff)
Merge branch 'SLE11-SP2' of kerncvs.suse.de:/home/git/kernel-source into SLE11-SP2rpm-3.0.51-0.7.9
-rw-r--r--kernel-source.changes14
-rw-r--r--patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch4
-rw-r--r--patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch22
-rw-r--r--series.conf1
4 files changed, 41 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index c116373217..37972f91bc 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -5,6 +5,20 @@ Thu Nov 29 23:11:29 CET 2012 - jbohac@suse.cz
netfilter: ipset: ignore KABI changes.
-------------------------------------------------------------------
+Thu Nov 29 18:04:48 CET 2012 - dsterba@suse.cz
+
+- patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch:
+ Refresh.
+
+-------------------------------------------------------------------
+Thu Nov 29 18:01:10 CET 2012 - dsterba@suse.cz
+
+- patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch:
+ Refresh.
+- patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch:
+ btrfs: fix double mntput() in mount_subvol().
+
+-------------------------------------------------------------------
Thu Nov 29 15:50:17 CET 2012 - jbohac@suse.cz
- patches.fixes/netfilter-ipset-fix-adding-ranges-to-hash-types.patch:
diff --git a/patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch b/patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch
index f4dfb1c5eb..d14917ceed 100644
--- a/patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch
+++ b/patches.suse/btrfs-0211-btrfs_multi_bio-replaced-with-btrfs_bio.patch
@@ -3,6 +3,7 @@ Date: Thu, 4 Aug 2011 17:15:33 +0200
Patch-mainline: v3.2-rc1
References: FATE#306586
Git-commit: a1d3c4786a4b9c71c0767aa656a759968f7554b6
+Git-commit: 21ca543efc12674fddb22ddf4ea4906427f4e982
Subject: [PATCH] btrfs: btrfs_multi_bio replaced with btrfs_bio
btrfs_bio is a bio abstraction able to split and not complete after the last
@@ -10,6 +11,9 @@ bio has returned (like the old btrfs_multi_bio). Additionally, btrfs_bio
tracks the mirror_num used to read data which can be used for error
correction purposes.
+[Merged with a cleanup commit "Btrfs: rename btrfs_bio multi -> bbio for
+consistency"]
+
Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: David Sterba <dsterba@suse.cz>
---
diff --git a/patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch b/patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch
new file mode 100644
index 0000000000..f9a87cda8c
--- /dev/null
+++ b/patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch
@@ -0,0 +1,22 @@
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Wed, 16 Nov 2011 16:06:09 -0500
+Patch-mainline: 3.2
+Git-commit: 8d514bbf37eecf0a3e309284728637816a36764b
+Subject: [PATCH] btrfs: fix double mntput() in mount_subvol()
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: David Sterba <dsterba@suse.cz>
+---
+ fs/btrfs/super.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/btrfs/super.c
++++ b/fs/btrfs/super.c
+@@ -861,7 +861,6 @@ static struct dentry *mount_subvol(const
+
+ if (!is_subvolume_inode(nd.path.dentry->d_inode)) {
+ path_put(&nd.path);
+- mntput(mnt);
+ error = -EINVAL;
+ printk(KERN_ERR "btrfs: '%s' is not a valid subvolume\n",
+ subvol_name);
diff --git a/series.conf b/series.conf
index 3d7fc7aefe..b22ee16b06 100644
--- a/series.conf
+++ b/series.conf
@@ -1135,6 +1135,7 @@
patches.suse/btrfs-0239-fix-deadlock-caused-by-the-race-between-reloca.patch
patches.suse/btrfs-0240-handle-bio_add_page-failure-gracefully-in-scru.patch
patches.suse/btrfs-0241-rename-the-option-to-nospace_cache.patch
+ patches.suse/btrfs-0288-fix-double-mntput-in-mount_subvol.patch
patches.suse/btrfs-0242-fix-tree-corruption-after-multi-thread-snapsho.patch
patches.suse/btrfs-0243-fix-barrier-flushes.patch
patches.suse/btrfs-0244-Fix-up-32-64-bit-compatibility-for-new-ioctls.patch