Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Henriques <lhenriques@suse.com>2019-01-16 16:12:01 +0000
committerLuis Henriques <lhenriques@suse.com>2019-01-18 11:21:08 +0000
commitcade00e18cf9cfe2c1897d52f5be656e80bfe602 (patch)
tree77fe49983d8b5b3bf325a8964a76b1ebe6e11170
parentec0a098f1afec2694386b4412d752fb066f718e9 (diff)
ceph: remove redundant assignment (bsc#1122215).
-rw-r--r--patches.suse/ceph-remove-redundant-assignment.patch30
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.suse/ceph-remove-redundant-assignment.patch b/patches.suse/ceph-remove-redundant-assignment.patch
new file mode 100644
index 0000000000..15adab7d60
--- /dev/null
+++ b/patches.suse/ceph-remove-redundant-assignment.patch
@@ -0,0 +1,30 @@
+From: Chengguang Xu <cgxu519@gmx.com>
+Date: Thu, 15 Nov 2018 22:27:01 +0800
+Subject: ceph: remove redundant assignment
+Git-commit: 0cab9f33d9c33f5ea94e5438fbc91bc8b7f48057
+Patch-mainline: v5.0-rc1
+References: bsc#1122215
+
+There is redundant assighment of variable i in
+ceph_mdsmap_get_random_mds(), just remvoe it.
+
+Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+Acked-by: Luis Henriques <lhenriques@suse.com>
+---
+ fs/ceph/mdsmap.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
+index 44e53abeb32a..1a2c5d390f7f 100644
+--- a/fs/ceph/mdsmap.c
++++ b/fs/ceph/mdsmap.c
+@@ -35,7 +35,6 @@ int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m)
+
+ /* pick */
+ n = prandom_u32() % n;
+- i = 0;
+ for (i = 0; n > 0; i++, n--)
+ while (m->m_info[i].state <= 0)
+ i++;
+
diff --git a/series.conf b/series.conf
index 199b052110..f16cbb1a54 100644
--- a/series.conf
+++ b/series.conf
@@ -42493,6 +42493,7 @@
patches.drivers/ALSA-hda-tegra-clear-pending-irq-handlers.patch
patches.suse/mm-speed-up-mremap-by-20x-on-large-regions.patch
patches.suse/ceph-cleanup-splice_dentry.patch
+ patches.suse/ceph-remove-redundant-assignment.patch
patches.fixes/ceph-don-t-update-importing-cap-s-mseq-when-handing-cap-export.patch
patches.fixes/xfs-xfs_buf-drop-useless-LIST_HEAD.patch
patches.drivers/thermal-bcm2835-enable-hwmon-explicitly.patch