Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-18 01:28:47 +0200
committerAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-18 01:28:47 +0200
commitb0ec684d343081be69c395f30a344fa34de8cc52 (patch)
tree60d40e159d8655d824fa8c357d57b90b534627b9
parent2fc02cbeab9e6df423ed9f51e8276887a11fc0d7 (diff)
xfs: fix unused variable warning in xfs_buf_set_ref()
(bsc#1114427).
-rw-r--r--patches.fixes/xfs-fix-unused-variable-warning-in-xfs_buf_set_ref.patch45
-rw-r--r--series.conf1
2 files changed, 46 insertions, 0 deletions
diff --git a/patches.fixes/xfs-fix-unused-variable-warning-in-xfs_buf_set_ref.patch b/patches.fixes/xfs-fix-unused-variable-warning-in-xfs_buf_set_ref.patch
new file mode 100644
index 0000000000..97eaa8e2b2
--- /dev/null
+++ b/patches.fixes/xfs-fix-unused-variable-warning-in-xfs_buf_set_ref.patch
@@ -0,0 +1,45 @@
+From 4eadcf9a417a4689e596e3c2a99857c2e3603049 Mon Sep 17 00:00:00 2001
+From: Brian Foster <bfoster@redhat.com>
+Date: Fri, 27 Oct 2017 09:20:28 -0700
+Subject: [PATCH] xfs: fix unused variable warning in xfs_buf_set_ref()
+Git-commit: 4eadcf9a417a4689e596e3c2a99857c2e3603049
+Patch-mainline: v4.15-rc1
+References: bsc#1114427
+
+Fix an unused variable warning on non-DEBUG builds introduced by
+commit 7561d27e90 ("xfs: buffer lru reference count error injection
+tag").
+
+Signed-off-by: Brian Foster <bfoster@redhat.com>
+Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+
+---
+ fs/xfs/xfs_buf.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
+index d481dd2b29a6..db786bce7c03 100644
+--- a/fs/xfs/xfs_buf.c
++++ b/fs/xfs/xfs_buf.c
+@@ -2133,14 +2133,13 @@ xfs_buf_terminate(void)
+
+ void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref)
+ {
+- struct xfs_mount *mp = bp->b_target->bt_mount;
+-
+ /*
+ * Set the lru reference count to 0 based on the error injection tag.
+ * This allows userspace to disrupt buffer caching for debug/testing
+ * purposes.
+ */
+- if (XFS_TEST_ERROR(false, mp, XFS_ERRTAG_BUF_LRU_REF))
++ if (XFS_TEST_ERROR(false, bp->b_target->bt_mount,
++ XFS_ERRTAG_BUF_LRU_REF))
+ lru_ref = 0;
+
+ atomic_set(&bp->b_lru_ref, lru_ref);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 298def45fc..f168e9ac80 100644
--- a/series.conf
+++ b/series.conf
@@ -8267,6 +8267,7 @@
patches.fixes/0046-xfs-add-a-new-xfs_iext_lookup_extent_before-helper.patch
patches.fixes/xfs-fix-log-block-underflow-during-recovery-c.patch
patches.fixes/xfs-validate-sb_logsunit-is-a-multiple-of-the-fs-blo.patch
+ patches.fixes/xfs-fix-unused-variable-warning-in-xfs_buf_set_ref.patch
patches.fixes/xfs-truncate-pagecache-before-writeback-in-xfs_setat.patch
patches.fixes/0047-xfs-don-t-create-overlapping-extents-in-xfs_bmap_add.patch
patches.fixes/0048-xfs-remove-a-duplicate-assignment-in-xfs_bmap_add_ex.patch