From 876c93be69f5208dd31aa7a567941e8eec8cac7c Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 3 Dec 2020 11:24:32 +0100
Subject: [PATCH] qa: krbd_stable_pages_required.sh: move to stable_writes
 attribute

bdi/stable_pages_required attribute was deprecated in 5.10 and now
always returns 0.  The replacement is queue/stable_writes.  (It is
also writeable, so we can simplify these test cases somewhat in the
future.)

Fixes: https://tracker.ceph.com/issues/48232
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 5adfc15b873bc16d698e7398d3ef2c2a46e8a9df)

Conflicts:
	qa/workunits/rbd/krbd_stable_writes.sh
- this file is much bigger in master than in nautilus
---
 qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml  | 5 -----
 qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml          | 5 +++++
 ...krbd_stable_pages_required.sh => krbd_stable_writes.sh} | 7 ++++---
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml
 create mode 100644 qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml
 rename qa/workunits/rbd/{krbd_stable_pages_required.sh => krbd_stable_writes.sh} (61%)

diff --git a/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml b/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml
deleted file mode 100644
index 3d23227a022c9..0000000000000
--- a/qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - rbd/krbd_stable_pages_required.sh
diff --git a/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml b/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml
new file mode 100644
index 0000000000000..cd1ba930f1f7c
--- /dev/null
+++ b/qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - rbd/krbd_stable_writes.sh
diff --git a/qa/workunits/rbd/krbd_stable_pages_required.sh b/qa/workunits/rbd/krbd_stable_writes.sh
similarity index 61%
rename from qa/workunits/rbd/krbd_stable_pages_required.sh
rename to qa/workunits/rbd/krbd_stable_writes.sh
index 46340a7d200e0..45e04123fea01 100755
--- a/qa/workunits/rbd/krbd_stable_pages_required.sh
+++ b/qa/workunits/rbd/krbd_stable_writes.sh
@@ -2,16 +2,17 @@
 
 set -ex
 
-IMAGE_NAME="stable-pages-required-test"
+IMAGE_NAME="stable-writes-test"
 
 rbd create --size 1 $IMAGE_NAME
 DEV=$(sudo rbd map $IMAGE_NAME)
 [[ $(blockdev --getsize64 $DEV) -eq 1048576 ]]
-grep -q 1 /sys/block/${DEV#/dev/}/bdi/stable_pages_required
+grep -q 1 /sys/block/${DEV#/dev/}/queue/stable_writes
 
 rbd resize --size 2 $IMAGE_NAME
 [[ $(blockdev --getsize64 $DEV) -eq 2097152 ]]
-grep -q 1 /sys/block/${DEV#/dev/}/bdi/stable_pages_required
+grep -q 1 /sys/block/${DEV#/dev/}/queue/stable_writes
+
 sudo rbd unmap $DEV
 
 echo OK
-- 
2.47.3