From 5adfc15b873bc16d698e7398d3ef2c2a46e8a9df 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>
---
 qa/suites/krbd/wac/sysfs/tasks/stable_pages_required.yaml | 5 -----
 qa/suites/krbd/wac/sysfs/tasks/stable_writes.yaml         | 5 +++++
 ...rbd_stable_pages_required.sh => krbd_stable_writes.sh} | 8 ++++----
 3 files changed, 9 insertions(+), 9 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} (91%)

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 91%
rename from qa/workunits/rbd/krbd_stable_pages_required.sh
rename to qa/workunits/rbd/krbd_stable_writes.sh
index 28b545f6dd832..d00e5fd043d6b 100755
--- a/qa/workunits/rbd/krbd_stable_pages_required.sh
+++ b/qa/workunits/rbd/krbd_stable_writes.sh
@@ -8,7 +8,7 @@ function assert_dm() {
 
     local devno
     devno=$(sudo dmsetup info -c --noheadings -o Major,Minor $name)
-    grep -q $val /sys/dev/block/$devno/bdi/stable_pages_required
+    grep -q $val /sys/dev/block/$devno/queue/stable_writes
 }
 
 function dmsetup_reload() {
@@ -22,7 +22,7 @@ function dmsetup_reload() {
     sudo dmsetup resume $name
 }
 
-IMAGE_NAME="stable-pages-required-test"
+IMAGE_NAME="stable-writes-test"
 
 rbd create --size 1 $IMAGE_NAME
 DEV=$(sudo rbd map $IMAGE_NAME)
@@ -31,11 +31,11 @@ fallocate -l 1M loopfile
 LOOP_DEV=$(sudo losetup -f --show loopfile)
 
 [[ $(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
 
 cat <<EOF | sudo dmsetup create tbl
 0 1024 linear $LOOP_DEV 0
-- 
2.39.5