md: improve variable names in md_flush_request()

This patch improves readability by using better variable names
in flush request coalescing logic.

Signed-off-by: Pankaj Gupta <pankaj.gupta@cloud.ionos.com>
Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Song Liu <songliubraving@fb.com>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 16a97dc385b493a3114582d9fcf3a510388760eb..3992e8c5c0d6e78bc37783afa9b623f20abc6ba2 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -639,7 +639,7 @@ static void md_submit_flush_data(struct work_struct *ws)
         * could wait for this and below md_handle_request could wait for those
         * bios because of suspend check
         */
-       mddev->last_flush = mddev->start_flush;
+       mddev->prev_flush_start = mddev->start_flush;
        mddev->flush_bio = NULL;
        wake_up(&mddev->sb_wait);
 
@@ -660,13 +660,13 @@ static void md_submit_flush_data(struct work_struct *ws)
  */
 bool md_flush_request(struct mddev *mddev, struct bio *bio)
 {
-       ktime_t start = ktime_get_boottime();
+       ktime_t req_start = ktime_get_boottime();
        spin_lock_irq(&mddev->lock);
        wait_event_lock_irq(mddev->sb_wait,
                            !mddev->flush_bio ||
-                           ktime_after(mddev->last_flush, start),
+                           ktime_after(mddev->prev_flush_start, req_start),
                            mddev->lock);
-       if (!ktime_after(mddev->last_flush, start)) {
+       if (!ktime_after(mddev->prev_flush_start, req_start)) {
                WARN_ON(mddev->flush_bio);
                mddev->flush_bio = bio;
                bio = NULL;

diff --git a/drivers/md/md.h b/drivers/md/md.h
index ccfb69868c2ec95c90ad234c332e5b5eca38c18d..2292c847f9ddcd0dd2be96506722abc41d8815aa 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -495,9 +495,9 @@ struct mddev {
         */
        struct bio *flush_bio;
        atomic_t flush_pending;
-       ktime_t start_flush, last_flush; /* last_flush is when the last completed
-                                         * flush was started.
-                                         */
+       ktime_t start_flush, prev_flush_start; /* prev_flush_start is when the previous completed
+                                               * flush was started.
+                                               */
        struct work_struct flush_work;
        struct work_struct event_work;  /* used by dm to report failure event */
        mempool_t *serial_info_pool;